From e81ddeb685f494bfcfa592212fe8d44c9cc55862 Mon Sep 17 00:00:00 2001
From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Thu, 13 Apr 2017 13:46:31 +0000
Subject: Introduce common resources for docker templates

This enables common resources that the docker templates might need.
The initial resource only is common volumes, and two volumes are
introduced (localtime and hosts).

Change-Id: Ic55af32803f9493a61f9b57aff849bfc6187d992
---
 docker/services/gnocchi-api.yaml | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

(limited to 'docker/services/gnocchi-api.yaml')

diff --git a/docker/services/gnocchi-api.yaml b/docker/services/gnocchi-api.yaml
index 659785aa..3b052146 100644
--- a/docker/services/gnocchi-api.yaml
+++ b/docker/services/gnocchi-api.yaml
@@ -29,6 +29,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   GnocchiApiPuppetBase:
       type: ../../puppet/services/gnocchi-api.yaml
       properties:
@@ -76,10 +79,13 @@ 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:
@@ -88,12 +94,15 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/gnocchi-api.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/gnocchi/etc/gnocchi/:/etc/gnocchi/:ro
-              - /var/lib/config-data/gnocchi/etc/httpd/:/etc/httpd/:ro
-              - /var/lib/config-data/gnocchi/var/www/:/var/www/:ro
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
+              yaql:
+                expression: $.data.common.concat($.data.service)
+                data:
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /var/lib/kolla/config_files/gnocchi-api.json:/var/lib/kolla/config_files/config.json:ro
+                    - /var/lib/config-data/gnocchi/etc/gnocchi/:/etc/gnocchi/:ro
+                    - /var/lib/config-data/gnocchi/etc/httpd/:/etc/httpd/:ro
+                    - /var/lib/config-data/gnocchi/var/www/:/var/www/:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks:
-- 
cgit 1.2.3-korg