Merge pull request #28 from puppetlabs/use-node_group-apply

Use node group apply

Author: reidmv

Diff for: lib/puppet/functions/pe_xl/node_manager_yaml_location.rb

@@ -0,0 +1,8 @@
+Puppet::Functions.create_function(:'pe_xl::node_manager_yaml_location') do
+  dispatch :nm_yaml_location do
+  end
+
+  def nm_yaml_location()
+    File.join(Puppet.settings['confdir'], 'node_manager.yaml')
+  end
+end

Diff for: manifests/setup/node_manager.pp

@@ -61,18 +61,21 @@
     variables => { 'pe_master' => true },
   }
 
-  # This class has to be included here because puppet_enterprise is declared
-  # in the console with parameters. It is therefore not possible to include
-  # puppet_enterprise::profile::database in code without causing a conflict.
-  node_group { 'PE Database':
-    ensure               => present,
-    parent               => 'PE Infrastructure',
-    environment          => 'production',
-    override_environment => false,
-    rule                 => ['and', ['=', ['trusted', 'extensions', 'pp_role'], 'pe_xl::puppetdb_database']],
-    classes              => {
-      'puppet_enterprise::profile::database' => { },
-    },
+  # Create the database group if a database host is external
+  if ($puppetdb_database_host != $master_host) {
+    # This class has to be included here because puppet_enterprise is declared
+    # in the console with parameters. It is therefore not possible to include
+    # puppet_enterprise::profile::database in code without causing a conflict.
+    node_group { 'PE Database':
+      ensure               => present,
+      parent               => 'PE Infrastructure',
+      environment          => 'production',
+      override_environment => false,
+      rule                 => ['and', ['=', ['trusted', 'extensions', 'pp_role'], 'pe_xl::puppetdb_database']],
+      classes              => {
+        'puppet_enterprise::profile::database' => { },
+      },
+    }
   }
 
   # Create data-only groups to store PuppetDB PostgreSQL database configuration

Diff for: plans/unit/configure.pp

@@ -37,28 +37,42 @@
     $compiler_hosts,
   )
 
-  # Retrieve and deploy Puppet modules from the Forge so that they can be used
-  # for ensuring some configuration (node groups)
-  [ ['WhatsARanjit-node_manager', '0.7.1'],
-    ['puppetlabs-stdlib',         '5.0.0'],
-  ].each |$tuple| {
-    run_plan('pe_xl::util::install_module',
-      nodes      => $master_target,
-      module     => $tuple[0],
-      version    => $tuple[1],
-      stagingdir => $stagingdir,
-    )
-  }
-
   # Set up the console node groups to configure the various hosts in their
   # roles
-  run_task('pe_xl::configure_node_groups', $master_target,
-    master_host                    => $master_target.pe_xl::target_host(),
-    master_replica_host            => $master_replica_target.pe_xl::target_host(),
-    puppetdb_database_host         => $puppetdb_database_target.pe_xl::target_host(),
-    puppetdb_database_replica_host => $puppetdb_database_replica_target.pe_xl::target_host(),
-    compiler_pool_address          => $compiler_pool_address,
-  )
+
+  # Pending resolution of Bolt GH-1244, Target objects and their methods are
+  # not accessible inside apply() blocks. Work around the limitation for now
+  # by using string variables calculated outside the apply block. The
+  # commented-out values should be used once GH-1244 is resolved.
+
+  # WORKAROUND: GH-1244
+  $master_host_string = $master_target.pe_xl::target_host()
+  $master_replica_host_string = $master_replica_target.pe_xl::target_host()
+  $puppetdb_database_host_string = $puppetdb_database_target.pe_xl::target_host()
+  $puppetdb_database_replica_host_string = $puppetdb_database_replica_target.pe_xl::target_host()
+
+  apply($master_target) {
+    # Necessary to give the sandboxed Puppet executor the configuration
+    # necessary to connect to the classifier`
+    file { 'node_manager.yaml':
+      ensure   => file,
+      mode     => '0644',
+      path     => Deferred('pe_xl::node_manager_yaml_location'),
+      content  => epp('pe_xl/node_manager.yaml.epp', {
+        server => $master_host_string,
+      }),
+    }
+
+    class { 'pe_xl::setup::node_manager':
+      # WORKAROUND: GH-1244
+      master_host                    => $master_host_string, # $master_target.pe_xl::target_host(),
+      master_replica_host            => $master_replica_host_string, # $master_replica_target.pe_xl::target_host(),
+      puppetdb_database_host         => $puppetdb_database_host_string, # $puppetdb_database_target.pe_xl::target_host(),
+      puppetdb_database_replica_host => $puppetdb_database_replica_host_string, # $puppetdb_database_replica_target.pe_xl::target_host(),
+      compiler_pool_address          => $compiler_pool_address,
+      require                        => File['node_manager.yaml'],
+    }
+  }
 
   # Run Puppet in no-op on the compilers so that their status in PuppetDB
   # is updated and they can be identified by the puppet_enterprise module as

Diff for: plans/util/install_module.pp

@@ -0,0 +1,8 @@
+<%- | String $server,
+| -%>
+---
+server: <%= $server %>
+port: 4433
+hostcert: /etc/puppetlabs/puppet/ssl/certs/<%= $server %>.pem
+hostprivkey: /etc/puppetlabs/puppet/ssl/private_keys/<%= $server %>.pem
+localcacert: /etc/puppetlabs/puppet/ssl/certs/ca.pem