Merge "mysql: Only set certificate specs if TLS everywhere is enabled" into stable...

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

diff --git a/docker/services/manila-share.yaml b/docker/services/manila-share.yaml
index 09d1a57..cf3303c 100644 (file)
--- a/docker/services/manila-share.yaml
+++ b/docker/services/manila-share.yaml
@@ -42,6 +42,9 @@ resources:
   ContainersCommon:
     type: ./containers-common.yaml
 
+  MySQLClient:
+    type: ../../puppet/services/database/mysql-client.yaml
+
   ManilaBase:
     type: ../../puppet/services/manila-share.yaml
     properties:
@@ -58,8 +61,13 @@ outputs:
     value:
       service_name: {get_attr: [ManilaBase, role_data, service_name]}
       config_settings: {get_attr: [ManilaBase, role_data, config_settings]}
+      logging_source: {get_attr: [ManilaBase, role_data, logging_source]}
+      logging_groups: {get_attr: [ManilaBase, role_data, logging_groups]}
       step_config: &step_config
-        get_attr: [ManilaBase, role_data, step_config]
+        list_join:
+          - "\n"
+          - - {get_attr: [ManilaBase, role_data, step_config]}
+            - {get_attr: [MySQLClient, role_data, step_config]}
       service_config_settings: {get_attr: [ManilaBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:
@@ -75,9 +83,8 @@ outputs:
               dest: "/"
               merge: true
               preserve_properties: true
-            # NOTE(gfidente): ceph-ansible generated
-            - source: "/var/lib/kolla/config_files/src-ceph/*"
-              dest: "/etc/ceph"
+            - source: "/var/lib/kolla/config_files/src-ceph/"
+              dest: "/etc/ceph/"
               merge: true
               preserve_properties: true
           permissions:
@@ -97,7 +104,7 @@ outputs:
                    - /var/lib/kolla/config_files/manila_share.json:/var/lib/kolla/config_files/config.json:ro
                    - /var/lib/config-data/puppet-generated/manila/:/var/lib/kolla/config_files/src:ro
                    - /var/log/containers/manila:/var/log/manila
-                   - /etc/ceph/:/var/lib/kolla/config_files/src-ceph:ro
+                   - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
@@ -105,6 +112,10 @@ outputs:
           file:
             path: /var/log/containers/manila
             state: directory
+        - name: ensure ceph configurations exist
+          file:
+            path: /etc/ceph
+            state: directory
       upgrade_tasks:
         - name: Stop and disable manila_share service
           tags: step2