From 2d7a9a72e10526c07bdc77b2b8eefcc368db8b45 Mon Sep 17 00:00:00 2001
From: Nick Walker <nick.walker@puppetlabs.com>
Date: Wed, 11 Nov 2015 13:43:57 -0800
Subject: [PATCH] Refactor puppetmaster and zack_r10k_webhook

Moved the webhook resource out of puppetmaster and into zack_r10k
to support exchaning code_manager in place of zack_r10k

As a result I cleaned up some unnecessary parameters.

Installing both the r10k webhook and the code_manager at this time
for testing
---
 site/profile/manifests/puppetmaster.pp      | 19 +++----------------
 site/profile/manifests/zack_r10k_webhook.pp |  8 ++++++--
 site/role/manifests/all_in_one_pe.pp        | 15 +++------------
 3 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/site/profile/manifests/puppetmaster.pp b/site/profile/manifests/puppetmaster.pp
index e63d819..d6a657f 100644
--- a/site/profile/manifests/puppetmaster.pp
+++ b/site/profile/manifests/puppetmaster.pp
@@ -1,7 +1,4 @@
-class profile::puppetmaster (
-  $webhook_username,
-  $webhook_password
-) {
+class profile::puppetmaster {
 
   class { 'hiera':
     hierarchy  => [
@@ -28,28 +25,18 @@ class profile::puppetmaster (
   $git_management_system = hiera('git_management_system', undef)
   $gms_api_token         = hiera('gms_api_token', undef)
 
-  if $git_management_system in ['gitlab', 'github'] {
+  if !empty($gms_api_token) {
 
     git_deploy_key { "add_deploy_key_to_puppet_control-${::fqdn}":
       ensure       => present,
       name         => $::fqdn,
       path         => "${r10k_ssh_key_file}.pub",
-      token        => hiera('gms_api_token'),
+      token        => $gms_api_token,
       project_name => 'puppet/control-repo',
       server_url   => hiera('gms_server_url'),
       provider     => $git_management_system,
     }
   
-    git_webhook { "web_post_receive_webhook-${::fqdn}" :
-      ensure             => present,
-      webhook_url        => "https://${webhook_username}:${webhook_password}@${::fqdn}:8088/payload",
-      token              => hiera('gms_api_token'),
-      project_name       => 'puppet/control-repo',
-      server_url         => hiera('gms_server_url'),
-      provider           => $git_management_system,
-      disable_ssl_verify => true,
-    }
-
   }
   #END - Add deploy key and webhook to git management system
 
diff --git a/site/profile/manifests/zack_r10k_webhook.pp b/site/profile/manifests/zack_r10k_webhook.pp
index 3dae9d7..f35f856 100644
--- a/site/profile/manifests/zack_r10k_webhook.pp
+++ b/site/profile/manifests/zack_r10k_webhook.pp
@@ -1,9 +1,13 @@
 class profile::zack_r10k_webhook (
-  $username,
-  $password,
   $use_mcollective = false,
 ) {
 
+  $username = hiera('webhook_username', fqdn_rand_string(10, '', 'username'))
+  $password = hiera('webhook_password', fqdn_rand_string(20, '', 'password'))
+
+  $gms_api_token         = hiera('gms_api_token', undef)
+  $git_management_system = hiera('git_management_system', undef)
+
   if $use_mcollective {
   
     class { 'r10k::mcollective':
diff --git a/site/role/manifests/all_in_one_pe.pp b/site/role/manifests/all_in_one_pe.pp
index 6bc2eb3..3807e46 100644
--- a/site/role/manifests/all_in_one_pe.pp
+++ b/site/role/manifests/all_in_one_pe.pp
@@ -1,16 +1,7 @@
 class role::all_in_one_pe {
 
-  $webhook_username = hiera('webhook_username', fqdn_rand_string(10, '', 'username'))
-  $webhook_password = hiera('webhook_password', fqdn_rand_string(20, '', 'password'))
-
-  class { 'profile::puppetmaster' :
-    webhook_username => $webhook_username,
-    webhook_password => $webhook_password,
-  }
-
-  class { 'profile::zack_r10k_webhook' :
-    username => $webhook_username,
-    password => $webhook_password,
-  }
+  include profile::puppetmaster
+  include profile::zack_r10k_webhook
+  include profile::code_manager
 
 }