diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-01-31 10:15:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-01-31 10:15:48 +0000 |
| commit | 8f37ea165b75ff9cb069a7b0fd45e4d30a4c3c26 (patch) | |
| tree | cb5ad0edf8e8f437e5dbf5a4dae4b4fe670ce0ca /docker/services/services.yaml | |
| parent | 716374680b3d77745adb382a86dfe92801b803b2 (diff) | |
| parent | 9d82796da2ae30be4eb3dfcc9612c6947f882ded (diff) | |
Merge "docker: eliminate copy-json.py in favor of json-file"
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]}} |