diff options
| author | mail_redacted_for_web | 2016-01-05 13:27:26 -0800 |
|---|---|---|
| committer | mail_redacted_for_web | 2016-01-05 13:27:26 -0800 |
| commit | 9a876a61e730f1c17063ad0593c3b37625503b5e (patch) | |
| tree | c93741be83ef640c860297e0efe3bbb3d86bfca6 /site/role/manifests | |
| parent | a9d3be58aa816a0b909efa05cbb714c0e94c21be (diff) | |
| parent | 752f2ef87bb56895f5a63c89fd01fe0ed0c623be (diff) | |
| download | control-repo-template-9a876a61e730f1c17063ad0593c3b37625503b5e.tar.bz2 | |
Merge pull request #9 from npwalker/2015_3_prep
Changes for PE2015.3.0
Diffstat (limited to 'site/role/manifests')
| -rw-r--r-- | site/role/manifests/all_in_one_pe.pp | 14 | ||||
| -rw-r--r-- | site/role/manifests/all_in_one_pe_2015_2.pp | 6 |
2 files changed, 8 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..9e93155 100644 --- a/site/role/manifests/all_in_one_pe.pp +++ b/site/role/manifests/all_in_one_pe.pp @@ -1,16 +1,6 @@ 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::git_webhook } diff --git a/site/role/manifests/all_in_one_pe_2015_2.pp b/site/role/manifests/all_in_one_pe_2015_2.pp new file mode 100644 index 0000000..01bf717 --- /dev/null +++ b/site/role/manifests/all_in_one_pe_2015_2.pp @@ -0,0 +1,6 @@ +class role::all_in_one_pe_2015_2 { + + include profile::puppetmaster + include profile::zack_r10k_webhook + +} |