diff options
| author |   Steven Hardy <shardy@redhat.com> | 2016-09-23 15:39:33 +0100 |
|---|---|---|
| committer |   Carlos Camacho <ccamacho@redhat.com> | 2016-09-30 14:11:01 +0000 |
| commit | b3c73a7e9924037ab29aff547b3096c8f5fb1a62 (patch) | |
| tree | 7ea967fbb842a55de4e5e72460b95e871dc48342 /puppet/cephstorage-config.yaml | |
| parent | d601d64e110f5dfd3e471adc82ad8f898158c175 (diff) | |
Replace per role manifests with a common role manifest
This removes the (nearly empty) per role manifests, and
replaces them with a generic manifest, where we use str_replace
to substitute the role name at runtime (or in some cases a
subset of the name for backwards compatibility)
Change-Id: I79da0f523189959b783bbcbb3b0f37be778e02fe
Partial-Bug: #1626976
Diffstat (limited to 'puppet/cephstorage-config.yaml')
| -rw-r--r-- | puppet/cephstorage-config.yaml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/puppet/cephstorage-config.yaml b/puppet/cephstorage-config.yaml index 3f428609..09757ea7 100644 --- a/puppet/cephstorage-config.yaml +++ b/puppet/cephstorage-config.yaml @@ -1,7 +1,7 @@ heat_template_version: 2015-04-30 description: > - A software config which runs manifests/overcloud_cephstorage.pp + A software config which runs applies puppet on the cephstorage role parameters: ConfigDebug: @@ -32,10 +32,13 @@ resources: config: list_join: - '' - - - get_file: manifests/overcloud_cephstorage.pp + - - str_replace: + template: {get_file: manifests/overcloud_role.pp} + params: + __ROLE__: cephstorage - {get_param: StepConfig} outputs: OS::stack_id: - description: The software config which runs overcloud_controller.pp + description: The software config which applies puppet on the cephstorage role value: {get_resource: CephStoragePuppetConfigImpl} |