diff options
| author | mail_redacted_for_web | 2016-03-17 14:38:12 -0700 |
|---|---|---|
| committer | mail_redacted_for_web | 2016-03-17 14:38:12 -0700 |
| commit | 667c77892a1f3ef98982cfaf3cfb27c34aa15e28 (patch) | |
| tree | 1474e0c8b5b0882466598c9b0c517cc963b5acd2 /site/role/manifests | |
| parent | d250d971b91674fb5821839b20cfaac3e99dc8fd (diff) | |
| parent | 4978905d9b66aad5497c29aefb7229f58bee7785 (diff) | |
| download | control-repo-template-667c77892a1f3ef98982cfaf3cfb27c34aa15e28.tar.bz2 | |
Merge pull request #22 from npwalker/breakout_git_webhook_into_a_module
Move profile::git_webhook into seperate module pe_code_manager_webhook
Diffstat (limited to 'site/role/manifests')
| -rw-r--r-- | site/role/manifests/all_in_one_pe.pp | 2 | ||||
| -rw-r--r-- | site/role/manifests/all_in_one_pe_2015_2.pp | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/site/role/manifests/all_in_one_pe.pp b/site/role/manifests/all_in_one_pe.pp index 9e93155..5f72a30 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 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 deleted file mode 100644 index 337ca45..0000000 --- a/site/role/manifests/all_in_one_pe_2015_2.pp +++ /dev/null @@ -1,6 +0,0 @@ -class role::all_in_one_pe_2015_2 { - - include profile::puppetmaster - include profile::git_webhook - -} |