From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 19 Apr 2017 10:54:36 +0000 (+0000)
Subject: Merge "Introduce common resources for docker templates"
X-Git-Tag: opnfv-6.0.0~763
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=431bc8109a0233ddd915374a9d0f19da76754352;p=apex-tripleo-heat-templates.git

Merge "Introduce common resources for docker templates"
---

431bc8109a0233ddd915374a9d0f19da76754352
diff --cc docker/services/aodh-api.yaml
index 38177220,17bdb377..3181fad7
--- a/docker/services/aodh-api.yaml
+++ b/docker/services/aodh-api.yaml
@@@ -76,13 -79,16 +79,16 @@@ outputs
              privileged: false
              detach: false
              volumes:
-               - /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro
-               - /etc/hosts:/etc/hosts:ro
-               - /etc/localtime:/etc/localtime:ro
-               - logs:/var/log
+               yaql:
+                 expression: $.data.common.concat($.data.service)
+                 data:
+                   common: {get_attr: [ContainersCommon, volumes]}
+                   service:
+                     - /var/lib/config-data/aodh/etc/aodh/:/etc/aodh/:ro
+                     - logs:/var/log
              command: /usr/bin/aodh-dbsync
          step_4:
 -          aodh-api:
 +          aodh_api:
              image: *aodh_image
              net: host
              privileged: false
diff --cc docker/services/gnocchi-api.yaml
index 0108d2ae,3b052146..1c61fa3e
--- a/docker/services/gnocchi-api.yaml
+++ b/docker/services/gnocchi-api.yaml
@@@ -76,13 -79,16 +79,16 @@@ outputs
              detach: false
              privileged: false
              volumes:
-               - /var/lib/config-data/gnocchi/etc/gnocchi/:/etc/gnocchi/:ro
-               - /etc/hosts:/etc/hosts:ro
-               - /etc/localtime:/etc/localtime:ro
-               - logs:/var/log
+               yaql:
+                 expression: $.data.common.concat($.data.service)
+                 data:
+                   common: {get_attr: [ContainersCommon, volumes]}
+                   service:
+                     - /var/lib/config-data/gnocchi/etc/gnocchi/:/etc/gnocchi/:ro
+                     - logs:/var/log
              command: ["/usr/bin/gnocchi-upgrade", "--skip-storage"]
          step_4:
 -          gnocchi-api:
 +          gnocchi_api:
              image: *gnocchi_image
              net: host
              privileged: false