diff options
| author | mail_redacted_for_web | 2015-12-07 07:55:32 -0800 |
|---|---|---|
| committer | mail_redacted_for_web | 2015-12-18 09:22:44 -0800 |
| commit | cc34e25fd54e60caf744130d90c14f8d839c7823 (patch) | |
| tree | af3f767b92ac48b17795fcadfe70e852a658b0df /site/role | |
| parent | 1b0f63be83464dc7bdc9561b3d5b3a937a4dfb39 (diff) | |
| download | control-repo-template-cc34e25fd54e60caf744130d90c14f8d839c7823.tar.bz2 | |
Final steps to make Code Manager work
- Moved ssh key generation and git deploy key out of the puppetmaster
profile and into zack_r10k and code_manager
- Swapped code manager into the all_in_one role
- Made a 2015.2 all_in_one role if users prefer to use it
- Conditionally move all existing code out of environmentpath
to allow file sync to sync files
- Update the README to compliment the new puppet code
Diffstat (limited to 'site/role')
| -rw-r--r-- | site/role/manifests/all_in_one_pe.pp | 1 | ||||
| -rw-r--r-- | site/role/manifests/all_in_one_pe_2015_2.pp | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/site/role/manifests/all_in_one_pe.pp b/site/role/manifests/all_in_one_pe.pp index 3807e46..a8152b1 100644 --- a/site/role/manifests/all_in_one_pe.pp +++ b/site/role/manifests/all_in_one_pe.pp @@ -1,7 +1,6 @@ class role::all_in_one_pe { include profile::puppetmaster - include profile::zack_r10k_webhook include profile::code_manager } 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 + +} |