From 1828e2162304d7d9a2e26743f175d76256b6e0c1 Mon Sep 17 00:00:00 2001
From: Nick Walker <nick.walker@puppetlabs.com>
Date: Fri, 16 Oct 2015 10:53:16 -0700
Subject: 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.
---
 site/profile/manifests/puppetmaster.pp           | 13 -------------
 site/profile/manifests/webhook_mcollective.pp    | 15 +++++++++++++++
 site/profile/manifests/webhook_no_mcollective.pp | 13 +++++++++++++
 3 files changed, 28 insertions(+), 13 deletions(-)
 create mode 100644 site/profile/manifests/webhook_mcollective.pp
 create mode 100644 site/profile/manifests/webhook_no_mcollective.pp

(limited to 'site/profile')

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'
diff --git a/site/profile/manifests/webhook_mcollective.pp b/site/profile/manifests/webhook_mcollective.pp
new file mode 100644
index 0000000..395cc7a
--- /dev/null
+++ b/site/profile/manifests/webhook_mcollective.pp
@@ -0,0 +1,15 @@
+class profile::webhook_mcollective {
+
+  class { 'r10k::mcollective':
+    notify  => Service['mcollective'],
+  }
+
+  include r10k::webhook::config
+
+  class {'r10k::webhook':
+    user    => 'root',
+    group   => '0',
+    require => Class['r10k::webhook::config'],
+  }
+ 
+}
diff --git a/site/profile/manifests/webhook_no_mcollective.pp b/site/profile/manifests/webhook_no_mcollective.pp
new file mode 100644
index 0000000..42c4954
--- /dev/null
+++ b/site/profile/manifests/webhook_no_mcollective.pp
@@ -0,0 +1,13 @@
+class profile::webhook_no_mcollective {
+
+  class {'r10k::webhook::config':
+    use_mcollective => false,
+  }
+
+  class {'r10k::webhook':
+    user    => 'root',
+    group   => '0',
+    require => Class['r10k::webhook::config'],
+  }
+
+}
-- 
cgit v1.2.3