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/role/manifests/all_in_one_pe.pp | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'site/role') 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 } -- cgit v1.2.3