From 2d7a9a72e10526c07bdc77b2b8eefcc368db8b45 Mon Sep 17 00:00:00 2001 From: Nick Walker Date: Wed, 11 Nov 2015 13:43:57 -0800 Subject: 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/zack_r10k_webhook.pp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'site/profile/manifests/zack_r10k_webhook.pp') 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': -- cgit v1.2.3