X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fservices.yaml;h=8c31107f5f68bc2dfce5a8445d4eca40cb884fd8;hb=c5e5d21a61808f7c09b85a2750a905bb57b54be1;hp=37e7b6554ee75e8b0d0cb2739f9b74574c76206c;hpb=fd870e423daa99bf52d4c36f444c9e4e23c78f3c;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/services.yaml b/docker/services/services.yaml
index 37e7b655..8c31107f 100644
--- a/docker/services/services.yaml
+++ b/docker/services/services.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-10-14
+heat_template_version: ocata
 
 description: >
   Utility stack to convert an array of services into a set of combined
@@ -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]}}