Containerized mongodb, disable by default, fix upgrade

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

diff --git a/docker/services/zaqar.yaml b/docker/services/zaqar.yaml
index df57ad6..34f2e43 100644 (file)
--- a/docker/services/zaqar.yaml
+++ b/docker/services/zaqar.yaml
@@ -53,8 +53,11 @@ resources:
   ContainersCommon:
     type: ./containers-common.yaml
 
+  MySQLClient:
+    type: ../../puppet/services/database/mysql-client.yaml
+
   ZaqarBase:
-    type: ../../puppet/services/zaqar.yaml
+    type: ../../puppet/services/zaqar-api.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
       ServiceData: {get_param: ServiceData}
@@ -71,7 +74,10 @@ outputs:
       service_name: {get_attr: [ZaqarBase, role_data, service_name]}
       config_settings: {get_attr: [ZaqarBase, role_data, config_settings]}
       step_config: &step_config
-       get_attr: [ZaqarBase, role_data, step_config]
+        list_join:
+          - "\n"
+          - - {get_attr: [ZaqarBase, role_data, step_config]}
+            - {get_attr: [MySQLClient, role_data, step_config]}
       service_config_settings: {get_attr: [ZaqarBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:
@@ -124,7 +130,8 @@ outputs:
                       -
                         - /var/lib/config-data/zaqar/etc/zaqar/:/etc/zaqar/:ro
                         - /var/log/containers/zaqar:/var/log/zaqar
-                  command: "/usr/bin/bootstrap_host_exec zaqar su zaqar -s /bin/bash -c 'zaqar-sql-db-manage upgrade head'"
+                        - /var/log/containers/httpd/zaqar:/var/log/httpd
+                  command: "/usr/bin/bootstrap_host_exec zaqar_api su zaqar -s /bin/bash -c 'zaqar-sql-db-manage upgrade head'"
             - {}
           - step_4:
               zaqar: