From 610850140d605b18f4a28099f160fff1e489443d Mon Sep 17 00:00:00 2001
From: Steve Baker <sbaker@redhat.com>
Date: Wed, 1 Mar 2017 03:09:31 +0000
Subject: Put docker puppet config in puppet_config dict

This approach removes the need for the yaql zip to build the
docker-puppet data by building the data in a puppet_config dict.

This allows a future change to make docker-puppet.py only accept dict
data.

Currently the step_config is left where it is and referenced inside
puppet_config, but feedback is welcome whether this is necessary or
desirable.

Change-Id: I4a4d7a6fd2735cb841174af305dbb62e0b3d3e8c
---
 docker/services/nova-metadata.yaml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'docker/services/nova-metadata.yaml')

diff --git a/docker/services/nova-metadata.yaml b/docker/services/nova-metadata.yaml
index a4baaa27..90c4c1c9 100644
--- a/docker/services/nova-metadata.yaml
+++ b/docker/services/nova-metadata.yaml
@@ -37,12 +37,15 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [NovaMetadataBase, role_data, config_settings]
-      step_config: {get_attr: [NovaMetadataBase, role_data, step_config]}
+      step_config: &step_config
+        get_attr: [NovaMetadataBase, role_data, step_config]
       service_config_settings: {get_attr: [NovaMetadataBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       docker_image: ''
-      puppet_tags: ''
-      config_volume: ''
-      config_image: ''
+      puppet_config:
+        config_volume: ''
+        puppet_tags: ''
+        step_config: *step_config
+        config_image: ''
       kolla_config: {}
       docker_config: {}
-- 
cgit 1.2.3-korg