X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fservices.yaml;h=84c56b5b975a2cf842c3c918c7fe864e77f06c1b;hb=d95674dc708e2d4c6e03136154d7ccf3d3380574;hp=cd9f4cb544336b065f6d86bf2d318583b18e5423;hpb=7b02ad73fba02689322342e24325cbe04cab637e;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/services.yaml b/docker/services/services.yaml
index cd9f4cb5..84c56b5b 100644
--- a/docker/services/services.yaml
+++ b/docker/services/services.yaml
@@ -67,13 +67,25 @@ outputs:
         {get_attr: [PuppetServices, role_data, global_config_settings]}
       step_config:
         {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]}
+      puppet_config: {get_attr: [ServiceChain, role_data, puppet_config]}
       kolla_config:
         map_merge: {get_attr: [ServiceChain, role_data, kolla_config]}
       docker_config:
         {get_attr: [ServiceChain, role_data, docker_config]}
       docker_puppet_tasks:
         {get_attr: [ServiceChain, role_data, docker_puppet_tasks]}
+      host_prep_tasks:
+        yaql:
+          # Note we use distinct() here to filter any identical tasks
+          expression: $.data.where($ != null).select($.get('host_prep_tasks')).where($ != null).flatten().distinct()
+          data: {get_attr: [ServiceChain, role_data]}
+      upgrade_tasks:
+        yaql:
+          # Note we use distinct() here to filter any identical tasks, e.g yum update for all services
+          expression: $.data.where($ != null).select($.get('upgrade_tasks')).where($ != null).flatten().distinct()
+          data: {get_attr: [ServiceChain, role_data]}
+      upgrade_batch_tasks:
+        yaql:
+          # Note we use distinct() here to filter any identical tasks, e.g yum update for all services
+          expression: $.data.where($ != null).select($.get('upgrade_batch_tasks')).where($ != null).flatten().distinct()
+          data: {get_attr: [ServiceChain, role_data]}