diff options
| author | mail_redacted_for_web | 2015-10-16 10:53:16 -0700 |
|---|---|---|
| committer | mail_redacted_for_web | 2015-10-16 10:56:07 -0700 |
| commit | 1828e2162304d7d9a2e26743f175d76256b6e0c1 (patch) | |
| tree | d57789d171cb44335ea142cc8ae19aa4e9b6fdfe /site/profile/manifests/puppetmaster.pp | |
| parent | 6ff5658a2a47cd3e6feaf20fa4083d33342e4b91 (diff) | |
| download | control-repo-template-1828e2162304d7d9a2e26743f175d76256b6e0c1.tar.bz2 | |
Change to using the webhook without mcollective
In order to complete the change I refactered the webhook into
its own set of profiles, one with mcollective and the other
without.
Diffstat (limited to 'site/profile/manifests/puppetmaster.pp')
| -rw-r--r-- | site/profile/manifests/puppetmaster.pp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/site/profile/manifests/puppetmaster.pp b/site/profile/manifests/puppetmaster.pp index 4fc06f2..bc52d3b 100644 --- a/site/profile/manifests/puppetmaster.pp +++ b/site/profile/manifests/puppetmaster.pp @@ -12,19 +12,6 @@ class profile::puppetmaster { group => 'root', notify => Service['pe-puppetserver'], } - - ##BEGIN - r10k webhook support - include r10k::mcollective - - include r10k::webhook::config - - class {'r10k::webhook': - user => 'root', - group => '0', - require => Class['r10k::webhook::config'], - notify => Service['mcollective'], - } - ##END - r10k webhook support #BEGIN - Generate an SSH key for r10k to connect to git $r10k_ssh_key_file = '/root/.ssh/r10k_rsa' |