Merge pull request #22 from npwalker/breakout_git_webhook_into_a_module

Move profile::git_webhook into seperate module pe_code_manager_webhook
puppetlabs · Mar 17, 2016 · 667c778 · 667c778
2 parents d250d97 + 4978905
commit 667c778
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 287 deletions.
diff --git a/Puppetfile b/Puppetfile
@@ -4,14 +4,15 @@ forge "http://forge.puppetlabs.com"
 # Note the versions are all set to :latest but after you've 
 # installed you should change them to the exact version you want
 mod "hunner/hiera",           '2.0.1'
-mod "puppetlabs/inifile", :latest
-mod "puppetlabs/stdlib", :latest
-mod "puppetlabs/concat", :latest
-mod "puppetlabs/ntp", :latest
-mod "saz/ssh", :latest
+mod "puppetlabs/inifile",     :latest
+mod "puppetlabs/stdlib",      :latest
+mod "puppetlabs/concat",      :latest
+mod "puppetlabs/ntp",         :latest
+mod "saz/ssh",                :latest
 mod "puppetlabs/postgresql",  '4.5.0'
 mod "puppet/stash",           '1.3.0'
 mod "puppetlabs/java",        '1.4.1'
+mod "npwalker/pe_code_manager_webhook", '1.0.2'
 
 #An example of using a specific forge module version instead of latest
 #Notice the addition of single quotes
@@ -28,6 +29,10 @@ mod 'r10k',
   :git => 'https://github.com/acidprime/r10k',
   :tag => 'v3.1.1'
 
+#mod 'pe_code_manager_webhook',
+#  :git => 'https://github.com/npwalker/pe_code_manager_webhook',
+#  :ref => '6957aa67e376ca7dcc9a60a58c247ed3e7b66c16'
+
 mod 'gms',
   :git    => 'https://github.com/npwalker/abrader-gms',
   :branch => 'gitlab_disable_ssl_verify_support'

diff --git a/site/no_fail_file/lib/puppet/parser/functions/no_fail_file.rb b/site/no_fail_file/lib/puppet/parser/functions/no_fail_file.rb
diff --git a/site/profile/manifests/git_webhook.pp b/site/profile/manifests/git_webhook.pp
diff --git a/site/profile/manifests/git_webhook/code_manager.pp b/site/profile/manifests/git_webhook/code_manager.pp
diff --git a/site/profile/manifests/git_webhook/zack_r10k_webhook.pp b/site/profile/manifests/git_webhook/zack_r10k_webhook.pp
diff --git a/site/profile/manifests/git_webhook/zack_r10k_webhook_disable.pp b/site/profile/manifests/git_webhook/zack_r10k_webhook_disable.pp
diff --git a/...assifer_settings_function/lib/puppet/parser/functions/puppet_master_classifer_settings.rb b/...assifer_settings_function/lib/puppet/parser/functions/puppet_master_classifer_settings.rb
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 profile::git_webhook
+  include pe_code_manager_webhook
 
 }
diff --git a/site/role/manifests/all_in_one_pe_2015_2.pp b/site/role/manifests/all_in_one_pe_2015_2.pp