X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fservices.yaml;h=8e8990246af35323af2aff425913a2652e481d79;hb=4fd12f1d18eaee79a299102df370281acf4dfac3;hp=3d51eb19f47ae2380a90592c3137daf9e814aef4;hpb=f08e5d8c5dad6e47a6ddeea7cd661d40e594b8d5;p=apex-tripleo-heat-templates.git diff --git a/docker/services/services.yaml b/docker/services/services.yaml index 3d51eb19..8e899024 100644 --- a/docker/services/services.yaml +++ b/docker/services/services.yaml @@ -66,8 +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]}