Merge "Do not log errors on non-existing container"

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

diff --git a/docker/services/zaqar.yaml b/docker/services/zaqar.yaml
index 30905ff..1160031 100644 (file)
--- a/docker/services/zaqar.yaml
+++ b/docker/services/zaqar.yaml
@@ -46,34 +46,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
+          command: /usr/sbin/httpd -DFOREGROUND
         /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:
@@ -81,9 +66,13 @@ outputs:
             net: host
             privileged: false
             restart: always
+            # NOTE(mandre) kolla image changes the user to 'zaqar', we need it
+            # to be root to run httpd
+            user: root
             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
+              - /var/lib/config-data/zaqar/etc/zaqar/:/etc/zaqar/:ro
+              - /var/lib/config-data/zaqar/etc/httpd:/etc/httpd/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
             environment:
@@ -95,7 +84,7 @@ outputs:
             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
+              - /var/lib/config-data/zaqar/etc/zaqar/:/etc/zaqar/:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
             environment:
@@ -103,5 +92,4 @@ outputs:
       upgrade_tasks:
         - name: Stop and disable zaqar service
           tags: step2
-          service: name=openstack-zaqar.service state=stopped enabled=no
-
+          service: name=httpd state=stopped enabled=no