openstack/tripleo-heat-templates
Code Issues Proposed changes

Align Manila Share docker templates

Browse Source 
Fix mismatches for templates for pacemaker vs docker
control planes

Change-Id: I796ae972dcfe0907025c5ecc4d0e48c15d6f5d68
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
This commit is contained in:
Bogdan Dobrelya 2018-01-19 13:43:57 +01:00
parent f6c353bfcd
commit e658c4b781
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/services/manila-share.yaml
View File

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

3
docker/services/pacemaker/manila-share.yaml
View File

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