From e658c4b7811181fc8d57c6b16a07dbaaa716b414 Mon Sep 17 00:00:00 2001 From: Bogdan Dobrelya Date: Fri, 19 Jan 2018 13:43:57 +0100 Subject: [PATCH] Align Manila Share docker templates Fix mismatches for templates for pacemaker vs docker control planes Change-Id: I796ae972dcfe0907025c5ecc4d0e48c15d6f5d68 Signed-off-by: Bogdan Dobrelya --- docker/services/manila-share.yaml | 5 ++++- docker/services/pacemaker/manila-share.yaml | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docker/services/manila-share.yaml b/docker/services/manila-share.yaml index cc6f0557e2..3fe2f29a44 100644 --- a/docker/services/manila-share.yaml +++ b/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 diff --git a/docker/services/pacemaker/manila-share.yaml b/docker/services/pacemaker/manila-share.yaml index aa549dc14b..916a67d6f3 100644 --- a/docker/services/pacemaker/manila-share.yaml +++ b/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: