From 9503f54349756fe7a93eecf2ecc6620c340f4679 Mon Sep 17 00:00:00 2001
From: Nick Walker <nick.walker@puppetlabs.com>
Date: Wed, 23 Mar 2016 15:53:41 -0700
Subject: [PATCH] Move puppetmaster profile to rampup_profile_puppetmaster
 module

Prior to this commit, the puppetmaster profile was embedded in this
control-repo.

After this commit, the puppetmaster profile is moved out into its
own module.
---
 Puppetfile                                    |  4 ++
 .../files/puppetmaster/update-classes.sh      | 11 ----
 site/profile/manifests/puppetmaster.pp        | 52 -------------------
 site/role/manifests/all_in_one_pe.pp          |  2 +-
 4 files changed, 5 insertions(+), 64 deletions(-)
 delete mode 100644 site/profile/files/puppetmaster/update-classes.sh
 delete mode 100644 site/profile/manifests/puppetmaster.pp

diff --git a/Puppetfile b/Puppetfile
index 5c64227..cc0ec75 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -40,3 +40,7 @@ mod 'gms',
 mod 'pltraining-rbac',
   :git    => 'https://github.com/puppetlabs/pltraining-rbac',
   :ref    => '2f60e1789a721ce83f8df061e13f8bf81cd4e4ce'
+
+mod 'rampup_profile_puppetmaster',
+  :git    => 'https://github.com/PuppetLabs-RampUpProgram/RampUp_profile_puppetmaster',
+  :branch => 'master'
diff --git a/site/profile/files/puppetmaster/update-classes.sh b/site/profile/files/puppetmaster/update-classes.sh
deleted file mode 100644
index fc33026..0000000
--- a/site/profile/files/puppetmaster/update-classes.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#https://docs.puppetlabs.com/pe/latest/nc_update_classes.html#post-v1update-classes
-
-CONFDIR=$(puppet master --configprint confdir)
-
-CERT=$(puppet master   --confdir ${CONFDIR} --configprint hostcert)
-CACERT=$(puppet master --confdir ${CONFDIR} --configprint localcacert)
-PRVKEY=$(puppet master --confdir ${CONFDIR} --configprint hostprivkey)
-OPTIONS="--cert ${CERT} --cacert ${CACERT} --key ${PRVKEY}"
-CONSOLE=$(awk '/server: /{print $NF}' ${CONFDIR}/classifier.yaml)
-
-curl -k -X POST ${OPTIONS} "https://${CONSOLE}:4433/classifier-api/v1/update-classes"
diff --git a/site/profile/manifests/puppetmaster.pp b/site/profile/manifests/puppetmaster.pp
deleted file mode 100644
index 0e68ddb..0000000
--- a/site/profile/manifests/puppetmaster.pp
+++ /dev/null
@@ -1,52 +0,0 @@
-class profile::puppetmaster {
-
-  $hiera_yaml = "${::settings::confdir}/hiera.yaml"
-
-  class { 'hiera':
-    hierarchy  => [
-      'virtual/%{::virtual}',
-      'nodes/%{::trusted.certname}',
-      'common',
-    ],
-    hiera_yaml => $hiera_yaml,
-    datadir    => '/etc/puppetlabs/code/environments/%{environment}/hieradata',
-    owner      => 'pe-puppet',
-    group      => 'pe-puppet',
-    notify     => Service['pe-puppetserver'],
-  }
-
-  ini_setting { 'puppet.conf hiera_config master section' :
-    ensure  => absent,
-    path    => "${::settings::confdir}/puppet.conf",
-    section => 'master',
-    setting => 'hiera_config',
-    value   => $hiera_yaml,
-    notify  => Service['pe-puppetserver'],
-  }
-
-  #remove the default hiera.yaml from the code-staging directory
-  #after the next code manager deployment it should be removed
-  #from the live codedir
-  file { '/etc/puppetlabs/code-staging/hiera.yaml' :
-    ensure => absent,
-  }
-
-  #Lay down update-classes.sh for use in r10k postrun_command
-  #This is configured via the pe_r10k::postrun key in hiera
-  file { '/usr/local/bin/update-classes.sh' :
-    ensure => file,
-    source => 'puppet:///modules/profile/puppetmaster/update-classes.sh',
-    mode   => '0755',
-  }
-
-  #https://docs.puppetlabs.com/puppet/latest/reference/config_file_environment.html#environmenttimeout
-  ini_setting { 'environment_timeout = unlimited':
-    ensure  => present,
-    path    => '/etc/puppetlabs/puppet/puppet.conf',
-    section => 'main',
-    setting => 'environment_timeout',
-    value   => 'unlimited',
-    notify  => Service['pe-puppetserver'],
-  }
-
-}
diff --git a/site/role/manifests/all_in_one_pe.pp b/site/role/manifests/all_in_one_pe.pp
index 5f72a30..dd2b988 100644
--- a/site/role/manifests/all_in_one_pe.pp
+++ b/site/role/manifests/all_in_one_pe.pp
@@ -1,6 +1,6 @@
 class role::all_in_one_pe {
 
-  include profile::puppetmaster
+  include rampup_profile_puppetmaster
   include pe_code_manager_webhook
 
 }