Iterate on correctness of node groups for HA

Trying to get everything configured correctly without touching the
groups managed by the `puppet infra` commands

Author: reidmv

Diff for: plans/configure.pp

@@ -18,6 +18,8 @@
   String[1]           $stagingdir = '/tmp',
 ) {
 
+  # Retrieve and deploy a couple of modules from the Forge so that they can be
+  # used for ensuring some configuration.
   $nm_module_tarball = 'WhatsARanjit-node_manager-0.7.1.tar.gz'
   pe_xl::retrieve_and_upload(
     "https://forge.puppet.com/v3/files/${nm_module_tarball}",
@@ -38,6 +40,8 @@
   run_command("/opt/puppetlabs/bin/puppet module install /tmp/${pexl_module_tarball}", $primary_master_host)
   run_command('chown -R pe-puppet:pe-puppet /etc/puppetlabs/code', $primary_master_host)
 
+  # Set up the console node groups to configure the various hosts in their
+  # roles
   run_task('pe_xl::configure_node_groups', $primary_master_host,
     primary_master_host            => $primary_master_host,
     primary_master_replica_host    => $primary_master_replica_host,
@@ -46,37 +50,42 @@
     compile_master_pool_address    => $compile_master_pool_address,
   )
 
+  # Run Puppet in no-op on the compile masters so that their status in PuppetDB
+  # is updated and they can be identified by the puppet_enterprise module as
+  # CMs
+  run_task('pe_xl::puppet_runonce', $compile_master_hosts,
+    noop => true,
+  )
+
+  # Run Puppet on the PuppetDB Database hosts to update their auth
+  # configuration to allow the compile masters to connect
   run_task('pe_xl::puppet_runonce', [
-    $primary_master_host,
     $puppetdb_database_host,
-    $primary_master_replica_host,
     $puppetdb_database_replica_host,
   ])
 
-  # Run the PE Replica Provision
-  run_task('pe_xl::provision_replica', $primary_master_host,
-    primary_master_replica => $primary_master_replica_host,
-  )
-
+  # Run Puppet in normal mode on compile master hosts to finish configuration
   run_task('pe_xl::puppet_runonce', [
     $primary_master_host,
-    $primary_master_replica_host,
+    $compile_master_hosts,
   ])
 
-  run_task(pe_xl::configure_replica_db_node_group, $primary_master_host,
-    puppetdb_database_replica_host => $puppetdb_database_replica_host,
+  # Run the PE Replica Provision
+  run_task('pe_xl::provision_replica', $primary_master_host,
+    primary_master_replica => $primary_master_replica_host,
   )
-  if $compile_master_hosts {
-    run_task('pe_xl::puppet_runonce', $compile_master_hosts)
-  }
 
+  #run_task('pe_xl::puppet_runonce', [
+  #  $primary_master_host,
+  #  $primary_master_replica_host,
+  #])
+
+  #run_task(pe_xl::configure_replica_db_node_group, $primary_master_host,
+  #  puppetdb_database_replica_host => $puppetdb_database_replica_host,
+  #)
   if $load_balancer_host {
     run_task('pe_xl::puppet_runonce', $load_balancer_host)
   }
 
-  if $compile_master_hosts {
-    run_task('pe_xl::puppet_runonce', $compile_master_hosts)
-  }
-
   return('Configuration of Puppet Enterprise with replica succeeded.')
 }

Diff for: tasks/configure_node_groups.pp

@@ -37,10 +37,10 @@ function param($name) { inline_template("<%= ENV['PT_${name}'] %>") }
       ['=', ['trusted', 'extensions', 'pp_cluster'], 'A'],
     ], 
     classes => {
-      'puppet_enterprise::profile::puppetdb' => { }
-    },
-    data    => {
-      'puppet_enterprise::profile::primary_master_replica' => {'database_host_puppetdb' => $puppetdb_database_host }
+      'puppet_enterprise::profile::puppetdb' => {
+        'puppetdb_host' => ['${clientcert}', $primary_master_host],
+        'puppetdb_port' => [8081],
+      }
     },
   }
 
@@ -52,9 +52,16 @@ function param($name) { inline_template("<%= ENV['PT_${name}'] %>") }
       ['=', ['trusted', 'extensions', 'pp_cluster'], 'B'],
     ], 
     classes => {
-      'puppet_enterprise::profile::puppetdb' => { }
+      'puppet_enterprise::profile::puppetdb' => {
+        'puppetdb_host' => ['${clientcert}', $primary_master_replica_host],
+        'puppetdb_port' => [8081],
+      }
     },
-    data    => {
+  }
+
+  node_group { 'PE HA Master':
+    ensure => present,
+    data   => {
       'puppet_enterprise::profile::primary_master_replica' => {'database_host_puppetdb' => $puppetdb_database_replica_host }
     },
   }

Diff for: tasks/puppet_runonce.json

@@ -1,6 +1,11 @@
 {
   "description": "Run the Puppet agent one time",
-  "parameters": { },
+  "parameters": {
+    "noop": {
+      "type": "Optional[Boolean]",
+      "description": "If true, run Puppet in no-op mode"
+    }
+  },
   "input_method": "environment",
   "implementations": [
     {"name": "puppet_runonce.sh"}

Diff for: tasks/puppet_runonce.sh

@@ -1,9 +1,16 @@
 #!/bin/bash
 
+unset NOOP_FLAG
+
+if [ "$PT_noop" = "true" ]; then
+  NOOP_FLAG="--noop"
+fi
+
 /opt/puppetlabs/bin/puppet agent \
   --onetime \
   --verbose \
   --no-daemonize \
   --no-usecacheonfailure \
   --no-splay \
-  --no-use_cached_catalog
+  --no-use_cached_catalog \
+  $NOOP_FLAG