diff options
| author | mail_redacted_for_web | 2015-11-11 13:43:57 -0800 |
|---|---|---|
| committer | mail_redacted_for_web | 2015-12-09 09:44:50 -0800 |
| commit | 2d7a9a72e10526c07bdc77b2b8eefcc368db8b45 (patch) | |
| tree | be32e22194fb48dd2436ada828371729a3344675 /site/role | |
| parent | 4c2be74083287516b72ab4f3ccaaf317ea7a2eb0 (diff) | |
| download | control-repo-template-2d7a9a72e10526c07bdc77b2b8eefcc368db8b45.tar.bz2 | |
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
Diffstat (limited to 'site/role')
| -rw-r--r-- | site/role/manifests/all_in_one_pe.pp | 15 |
1 files changed, 3 insertions, 12 deletions
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 } |