Merge "Add network_data.yaml to encapsulate list of networks for j2"

[apex-tripleo-heat-templates.git] / docker / services / zaqar.yaml

diff --git a/docker/services/zaqar.yaml b/docker/services/zaqar.yaml
index 1704278..fdb353b 100644 (file)
--- a/docker/services/zaqar.yaml
+++ b/docker/services/zaqar.yaml
@@ -29,6 +29,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   ZaqarBase:
     type: ../../puppet/services/zaqar.yaml
     properties:
@@ -46,34 +49,19 @@ outputs:
        get_attr: [ZaqarBase, role_data, step_config]
       service_config_settings: {get_attr: [ZaqarBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
-      docker_image: &zaqar_image
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerZaqarImage} ]
       puppet_config:
         config_volume: zaqar
         puppet_tags: zaqar_config
         step_config: *step_config
-        config_image: *zaqar_image
+        config_image: &zaqar_image
+          list_join:
+            - '/'
+            - [ {get_param: DockerNamespace}, {get_param: DockerZaqarImage} ]
       kolla_config:
         /var/lib/kolla/config_files/zaqar.json:
           command: /usr/bin/zaqar-server --config-file /etc/zaqar/zaqar.conf
-          config_files:
-          - dest: /etc/zaqar/zaqar.conf
-            owner: zaqar
-            perm: '0640'
-            source: /var/lib/kolla/config_files/src/etc/zaqar/zaqar.conf
         /var/lib/kolla/config_files/zaqar_websocket.json:
           command: /usr/bin/zaqar-server --config-file /etc/zaqar/zaqar.conf --config-file /etc/zaqar/1.conf
-          config_files:
-          - dest: /etc/zaqar/zaqar.conf
-            owner: zaqar
-            perm: '0640'
-            source: /var/lib/kolla/config_files/src/etc/zaqar/zaqar.conf
-          - dest: /etc/zaqar/1.conf
-            owner: zaqar
-            perm: '0640'
-            source: /var/lib/kolla/config_files/src/etc/zaqar/1.conf
       docker_config:
         step_4:
           zaqar:
@@ -82,10 +70,13 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/zaqar.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/zaqar/:/var/lib/kolla/config_files/src: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/zaqar.json:/var/lib/kolla/config_files/config.json:ro
+                    - /var/lib/config-data/zaqar/etc/zaqar/:/etc/zaqar/:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
           zaqar_websocket:
@@ -94,9 +85,17 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/zaqar_websocket.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/zaqar/:/var/lib/kolla/config_files/src: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/zaqar_websocket.json:/var/lib/kolla/config_files/config.json:ro
+                    - /var/lib/config-data/zaqar/etc/zaqar/:/etc/zaqar/:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      upgrade_tasks:
+        - name: Stop and disable zaqar service
+          tags: step2
+          service: name=openstack-zaqar.service state=stopped enabled=no
+