X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=docker%2Fservices%2Fmanila-share.yaml;h=cf3303c3c657866dafcadfd8ce3b38eefaa1ac3e;hb=5ee398bd0145fbc3e7584c3a9fd8b6c6cf5f61ad;hp=9733b6f988323d29ac2d1949e119efc80412cd83;hpb=a89fb921a1a8948241ca17ed1b92564725eb636a;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/manila-share.yaml b/docker/services/manila-share.yaml
index 9733b6f9..cf3303c3 100644
--- a/docker/services/manila-share.yaml
+++ b/docker/services/manila-share.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized Manila Share service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerManilaShareImage:
     description: image
-    default: 'centos-binary-manila-share:latest'
     type: string
   DockerManilaConfigImage:
     description: image
-    default: 'centos-binary-manila-base:latest'
     type: string
   EndpointMap:
     default: {}
@@ -48,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:
@@ -64,18 +61,20 @@ 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:
         config_volume: manila
         puppet_tags: manila_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerManilaConfigImage} ]
+        config_image: {get_param: DockerManilaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/manila_share.json:
           command: /usr/bin/manila-share --config-file /usr/share/manila/manila-dist.conf --config-file /etc/manila/manila.conf
@@ -84,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:
@@ -96,10 +94,7 @@ outputs:
       docker_config:
         step_4:
           manila_share:
-            image: &manila_share_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerManilaShareImage} ]
+            image: &manila_share_image {get_param: DockerManilaShareImage}
             net: host
             restart: always
             volumes:
@@ -109,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:
@@ -117,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