diff options
author | Steve Baker <sbaker@redhat.com> | 2017-03-01 03:09:31 +0000 |
---|---|---|
committer | Steve Baker <sbaker@redhat.com> | 2017-03-01 21:37:54 +0000 |
commit | 610850140d605b18f4a28099f160fff1e489443d (patch) | |
tree | e306e29a9f8e5909f987dd00ec525dc92ead6322 /docker/services/keystone.yaml | |
parent | ebee7ecfa70b5defe897995c72effa60538ccffc (diff) |
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
Diffstat (limited to 'docker/services/keystone.yaml')
-rw-r--r-- | docker/services/keystone.yaml | 10 |
1 files changed, 6 insertions, 4 deletions
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 |