Merge pull request #28 from npwalker/move_profiles_out_into_their_own…

…_modules Move profiles out into their own modules
puppetlabs · Mar 29, 2016 · 6a44737 · 6a44737
2 parents 55f983f + b3519dd
commit 6a44737
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 121 deletions.
diff --git a/Puppetfile b/Puppetfile
@@ -40,3 +40,15 @@ 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'
+
+mod 'rampup_profile_gitlab',
+  :git    => 'https://github.com/PuppetLabs-RampUpProgram/RampUp_profile_gitlab',
+  :branch => 'master'
+
+mod 'rampup_profile_stash',
+  :git    => 'https://github.com/PuppetLabs-RampUpProgram/RampUp_profile_stash',
+  :branch => 'master'
diff --git a/site/profile/files/puppetmaster/update-classes.sh b/site/profile/files/puppetmaster/update-classes.sh
diff --git a/site/profile/manifests/gitlab.pp b/site/profile/manifests/gitlab.pp
diff --git a/site/profile/manifests/puppetmaster.pp b/site/profile/manifests/puppetmaster.pp
diff --git a/site/profile/manifests/stash.pp b/site/profile/manifests/stash.pp
diff --git 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
 
 }
diff --git a/site/role/manifests/gitlab.pp b/site/role/manifests/gitlab.pp