diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-02-17 03:04:13 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-02-17 03:04:13 +0000 |
commit | 4fd12f1d18eaee79a299102df370281acf4dfac3 (patch) | |
tree | 3658ea45be68e41616b7c91679fed68bb038b451 /docker/services/services.yaml | |
parent | 1c486d57a89ed37b435bd344175301caaa32a489 (diff) | |
parent | ad2ea290bed17bff9b53ac225d3604ed642ee8bc (diff) |
Merge "docker: new hybrid deployment architecture and configuration"
Diffstat (limited to 'docker/services/services.yaml')
-rw-r--r-- | docker/services/services.yaml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/docker/services/services.yaml b/docker/services/services.yaml index 8c31107f..8e899024 100644 --- a/docker/services/services.yaml +++ b/docker/services/services.yaml @@ -66,10 +66,12 @@ outputs: global_config_settings: {get_attr: [PuppetServices, role_data, global_config_settings]} step_config: - {get_attr: [PuppetServices, role_data, step_config]} - puppet_tags: {list_join: [",", {get_attr: [ServiceChain, role_data, puppet_tags]}]} + {get_attr: [ServiceChain, role_data, step_config]} + docker_image: {get_attr: [ServiceChain, role_data, docker_image]} + puppet_tags: {get_attr: [ServiceChain, role_data, puppet_tags]} + config_volume: {get_attr: [ServiceChain, role_data, config_volume]} + config_image: {get_attr: [ServiceChain, role_data, config_image]} 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]}} + {get_attr: [ServiceChain, role_data, docker_config]} |