Merge "Align Manila Share docker templates"

docker/services/manila-share.yaml

@@ -119,8 +119,11 @@ outputs:
       host_prep_tasks:
         - name: create persistent directories
           file:
-            path: /var/log/containers/manila
+            path: "{{ item }}"
             state: directory
+          with_items:
+            - /var/log/containers/manila
+            - /var/lib/manila
         - name: manila logs readme
           copy:
             dest: /var/log/manila/readme.txt

docker/services/pacemaker/manila-share.yaml

@@ -56,6 +56,7 @@ resources:
     type: ../../../puppet/services/pacemaker/manila-share.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
+      ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
       RoleName: {get_param: RoleName}
@@ -90,7 +91,7 @@ outputs:
           list_join:
             - "\n"
             - - {get_attr: [ManilaBase, role_data, step_config]}
-            - - {get_attr: [MySQLClient, role_data, step_config]}
+              - {get_attr: [MySQLClient, role_data, step_config]}
         config_image: {get_param: DockerManilaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/manila_share.json: