aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorSteven Hardy <shardy@redhat.com>2017-07-19 11:44:56 +0100
committerSteven Hardy <shardy@redhat.com>2017-07-21 11:05:46 +0100
commit2ff922b0dcaa46b9e72c06debc6164c2623dd9a4 (patch)
treec31977507d00c020ff7f96a94379bd93eeddcbe3 /puppet
parentfdd4352375c24c189d028f34cc66b3b1f2d474ee (diff)
Move step_config/docker_config calculation into services.yaml
Moving these means we get a more accurate output from the overcloud RoleData output, which more closely reflects what is actually deployed. Change-Id: I154f36c1597cf4abe29ca0bfe15a54f507433fb1
Diffstat (limited to 'puppet')
-rw-r--r--puppet/puppet-steps.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/puppet-steps.j2 b/puppet/puppet-steps.j2
index 3d071018..37bc0002 100644
--- a/puppet/puppet-steps.j2
+++ b/puppet/puppet-steps.j2
@@ -36,7 +36,7 @@ resources:
{{role.name}}Config:
type: OS::TripleO::{{role.name}}Config
properties:
- StepConfig: {list_join: ["\n", {get_param: [role_data, {{role.name}}, step_config]}]}
+ StepConfig: {get_param: [role_data, {{role.name}}, step_config]}
# Step through a series of configuration steps
{% for step in range(1, deploy_steps_max) %}