From 2ff922b0dcaa46b9e72c06debc6164c2623dd9a4 Mon Sep 17 00:00:00 2001
From: Steven Hardy <shardy@redhat.com>
Date: Wed, 19 Jul 2017 11:44:56 +0100
Subject: 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
---
 puppet/puppet-steps.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'puppet')

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) %}
-- 
cgit 1.2.3-korg