Fixup commit to apply changes to live content

And clean up old, unused content.

Author: reidmv

installer/primary-master/csr_attributes.yaml

@@ -91,8 +91,8 @@
       'puppet_enterprise::profile::primary_master_replica' => {
         'database_host_puppetdb' => $puppetdb_database_host,
       },
-      'puppet_enterprise::profile::puppetdb'               => {
-        'database_host' => $puppetdb_database_host,
+      'puppet_enterprise' => {
+        'puppetdb_database_host' => $puppetdb_database_host,
       },
     },
   }
@@ -145,8 +145,8 @@
         'puppet_enterprise::profile::primary_master_replica' => {
           'database_host_puppetdb' => $puppetdb_database_replica_host,
         },
-        'puppet_enterprise::profile::puppetdb'               => {
-          'database_host' => $puppetdb_database_replica_host,
+        'puppet_enterprise' => {
+          'puppetdb_database_host' => $puppetdb_database_replica_host,
         },
       },
     }

installer/primary-master/pe.conf

@@ -119,7 +119,7 @@
     'console_admin_password'                                          => $console_password,
     'puppet_enterprise::puppet_master_host'                           => $master_target.peadm::target_name(),
     'pe_install::puppet_master_dnsaltnames'                           => $dns_alt_names,
-    'puppet_enterprise::profile::puppetdb::database_host'             => $puppetdb_database_target.peadm::target_name(),
+    'puppet_enterprise::puppetdb_database_host'                       => $puppetdb_database_target.peadm::target_name(),
     'puppet_enterprise::profile::master::code_manager_auto_configure' => true,
     'puppet_enterprise::profile::master::r10k_private_key'            => '/etc/puppetlabs/puppetserver/ssh/id-control_repo.rsa',
     'puppet_enterprise::profile::master::r10k_remote'                 => $r10k_remote,