diff options
| author | mail_redacted_for_web | 2016-03-29 16:22:26 -0700 |
|---|---|---|
| committer | mail_redacted_for_web | 2016-03-29 16:22:26 -0700 |
| commit | 6a44737d043f4140ab0116f619f79f913701df4c (patch) | |
| tree | ea493c5fcbe965c7379ea806d83f217388023242 /site/role | |
| parent | 55f983ffc9e6e92113ceea0bc51efb6b69d32f13 (diff) | |
| parent | b3519dd48cebfcdbf1dea4b42e8857e21e6f05a2 (diff) | |
| download | control-repo-template-6a44737d043f4140ab0116f619f79f913701df4c.tar.bz2 | |
Merge pull request #28 from npwalker/move_profiles_out_into_their_own_modules
Move profiles out into their own modules
Diffstat (limited to 'site/role')
| -rw-r--r-- | site/role/manifests/all_in_one_pe.pp | 2 | ||||
| -rw-r--r-- | site/role/manifests/gitlab.pp | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/site/role/manifests/all_in_one_pe.pp b/site/role/manifests/all_in_one_pe.pp index 5f72a30..dd2b988 100644 --- a/site/role/manifests/all_in_one_pe.pp +++ b/site/role/manifests/all_in_one_pe.pp @@ -1,6 +1,6 @@ class role::all_in_one_pe { - include profile::puppetmaster + include rampup_profile_puppetmaster include pe_code_manager_webhook } diff --git a/site/role/manifests/gitlab.pp b/site/role/manifests/gitlab.pp deleted file mode 100644 index 1f459d6..0000000 --- a/site/role/manifests/gitlab.pp +++ /dev/null @@ -1,5 +0,0 @@ -class role::gitlab { - - include profile::gitlab - -} |