openstack/kolla-ansible
Code Issues Proposed changes

Merge "Use ipc_mode: host for manila share"

Browse Source
This commit is contained in:
Zuul 2019-04-02 15:21:37 +00:00 committed by Gerrit Code Review
commit 0b67ce93eb
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/roles/manila/defaults/main.yml
View File

@ -58,6 +58,7 @@ manila_services:
volumes: volumes:
- "{{ node_config_directory }}/manila-data/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/manila-data/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "/dev/:/dev/"
- "/run/:/run/:shared" - "/run/:/run/:shared"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
- "{{ kolla_dev_repos_directory ~ '/manila/manila:/var/lib/kolla/venv/lib/python2.7/site-packages/manila' if manila_dev_mode | bool else '' }}" - "{{ kolla_dev_repos_directory ~ '/manila/manila:/var/lib/kolla/venv/lib/python2.7/site-packages/manila' if manila_dev_mode | bool else '' }}"

1
ansible/roles/manila/handlers/main.yml
View File

@ -89,6 +89,7 @@
name: "{{ service.container_name }}" name: "{{ service.container_name }}"
image: "{{ service.image }}" image: "{{ service.image }}"
privileged: "{{ service.privileged | default(False) }}" privileged: "{{ service.privileged | default(False) }}"
ipc_mode: "host"
volumes: "{{ service.volumes|reject('equalto', '')|list }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
when: when: