diff options
| author |   Dan Prince <dprince@redhat.com> | 2017-01-03 21:57:14 -0500 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2017-01-29 08:16:19 -0500 |
| commit | 9d82796da2ae30be4eb3dfcc9612c6947f882ded (patch) | |
| tree | d0de8079e27bed985f210cf794686f746cb9be97 /docker/services/services.yaml | |
| parent | 8a646686edb6822214abd9b91e4b593bcd616e46 (diff) | |
docker: eliminate copy-json.py in favor of json-file
This patch rewires how we configure the Kolla external config files
via Heat templates and uses a more simple json-file heat hook to
directly write out Kolla config files to disk.
By using a heat hook instead of a shell script we can avoid
Json conversion issues. Additionally, This generic json file hook will
be useful for other ad-hoc Json file configuration within the TripleO
docker architecture.
Co-Authored-By: Martin André <m.andre@redhat.com>
Change-Id: I8c72a4a9a7022f722bfe1cef3e18517605720cce
Depends-On: I2b372ac2e291339e436202c9fe58a681ed6a743f
Depends-On: Id3f779b11e23fd3122ef29b7ccbae116667d4520
Diffstat (limited to 'docker/services/services.yaml')
| -rw-r--r-- | docker/services/services.yaml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docker/services/services.yaml b/docker/services/services.yaml index 3d51eb19..8c31107f 100644 --- a/docker/services/services.yaml +++ b/docker/services/services.yaml @@ -68,6 +68,8 @@ outputs: step_config: {get_attr: [PuppetServices, role_data, step_config]} puppet_tags: {list_join: [",", {get_attr: [ServiceChain, role_data, puppet_tags]}]} + kolla_config: + map_merge: {get_attr: [ServiceChain, role_data, kolla_config]} docker_config: step_1: {map_merge: {get_attr: [ServiceChain, role_data, docker_config, step_1]}} step_2: {map_merge: {get_attr: [ServiceChain, role_data, docker_config, step_2]}} |