aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/compute-config.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-30 17:44:22 +0000
committerGerrit Code Review <review@openstack.org>2016-09-30 17:44:22 +0000
commit07819ffc0608faf4d56f8c100d47ebdcb059331f (patch)
treeb5de6a68b3f5c2ab97decdd324a73b9a42653724 /puppet/compute-config.yaml
parent6e70ca03645f5dee7a538dd32013eb3de1435608 (diff)
parentb3c73a7e9924037ab29aff547b3096c8f5fb1a62 (diff)
Merge "Replace per role manifests with a common role manifest"
Diffstat (limited to 'puppet/compute-config.yaml')
-rw-r--r--puppet/compute-config.yaml9
1 files changed, 6 insertions, 3 deletions
diff --git a/puppet/compute-config.yaml b/puppet/compute-config.yaml
index 2314c47d..acc9e61d 100644
--- a/puppet/compute-config.yaml
+++ b/puppet/compute-config.yaml
@@ -1,7 +1,7 @@
heat_template_version: 2015-04-30
description: >
- A software config which runs manifests/overcloud_compute.pp
+ A software config which applies puppet on the compute role
parameters:
ConfigDebug:
@@ -32,10 +32,13 @@ resources:
config:
list_join:
- ''
- - - get_file: manifests/overcloud_compute.pp
+ - - str_replace:
+ template: {get_file: manifests/overcloud_role.pp}
+ params:
+ __ROLE__: compute
- {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 compute role
value: {get_resource: ComputePuppetConfigImpl}