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/profile/manifests/zack_r10k_webhook.pp | |
| 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/profile/manifests/zack_r10k_webhook.pp')
| -rw-r--r-- | site/profile/manifests/zack_r10k_webhook.pp | 8 |
1 files changed, 6 insertions, 2 deletions
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': |