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/keystone.yaml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'docker/services/keystone.yaml')

diff --git a/docker/services/keystone.yaml b/docker/services/keystone.yaml
index 644326e0..52e80214 100644
--- a/docker/services/keystone.yaml
+++ b/docker/services/keystone.yaml
@@ -49,7 +49,7 @@ outputs:
         map_merge:
           - get_attr: [KeystoneBase, role_data, config_settings]
           - apache::default_vhost: false
-      step_config:
+      step_config: &step_config
         list_join:
           - "\n"
           - - "['Keystone_user', 'Keystone_endpoint', 'Keystone_domain', 'Keystone_tenant', 'Keystone_user_role', 'Keystone_role', 'Keystone_service'].each |String $val| { noop_resource($val) }"
@@ -60,9 +60,11 @@ outputs:
         list_join:
           - '/'
           - [ {get_param: DockerNamespace}, {get_param: DockerKeystoneImage} ]
-      puppet_tags: keystone_config
-      config_volume: keystone
-      config_image: *keystone_image
+      puppet_config:
+        config_volume: keystone
+        puppet_tags: keystone_config
+        step_config: *step_config
+        config_image: *keystone_image
       kolla_config:
          /var/lib/kolla/config_files/keystone.json:
            command: /usr/sbin/httpd -DFOREGROUND
-- 
cgit 1.2.3-korg