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/mistral-executor.yaml | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

(limited to 'docker/services/mistral-executor.yaml')

diff --git a/docker/services/mistral-executor.yaml b/docker/services/mistral-executor.yaml
index 45fed7b2..374b0be7 100644
--- a/docker/services/mistral-executor.yaml
+++ b/docker/services/mistral-executor.yaml
@@ -34,6 +34,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   MistralBase:
     type: ../../puppet/services/mistral-executor.yaml
     properties:
@@ -75,15 +78,18 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/mistral_executor.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/mistral/etc/mistral/:/etc/mistral/:ro
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
-              - /run:/run
-              # FIXME: this is required in order for Nova cells
-              # initialization workflows on the Undercloud. Need to
-              # exclude this on the overcloud for security reasons.
-              - /var/lib/config-data/nova/etc/nova:/etc/nova:ro
+              yaql:
+                expression: $.data.common.concat($.data.service)
+                data:
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /var/lib/kolla/config_files/mistral_executor.json:/var/lib/kolla/config_files/config.json:ro
+                    - /var/lib/config-data/mistral/etc/mistral/:/etc/mistral/:ro
+                    - /run:/run
+                    # FIXME: this is required in order for Nova cells
+                    # initialization workflows on the Undercloud. Need to
+                    # exclude this on the overcloud for security reasons.
+                    - /var/lib/config-data/nova/etc/nova:/etc/nova:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks:
-- 
cgit 1.2.3-korg