mount /run in sahara-engine container

sahara-engine service need to run ip netns command in container
when set use_namespaces=true in saraha.conf

Change-Id: I8b10cdd0127e1895ae40dfeed1a5910e6bcd701c
Related-Bug: #1687602
Closes-Bug: #1687624
This commit is contained in:
junbo 2017-05-02 19:26:41 +08:00
parent defc49448b
commit 73740ff670
3 changed files with 4 additions and 0 deletions

View File

@ -17,11 +17,13 @@ sahara_services:
group: sahara-engine group: sahara-engine
enabled: true enabled: true
image: "{{ sahara_engine_image_full }}" image: "{{ sahara_engine_image_full }}"
privileged: True
volumes: volumes:
- "{{ node_config_directory }}/sahara-engine/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/sahara-engine/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "sahara:/var/lib/sahara/" - "sahara:/var/lib/sahara/"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
- "/run:/run:shared"
#################### ####################

View File

@ -36,6 +36,7 @@
name: "{{ service.container_name }}" name: "{{ service.container_name }}"
image: "{{ service.image }}" image: "{{ service.image }}"
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
privileged: "{{ service.privileged | default(False) }}"
when: when:
- action != "config" - action != "config"
- inventory_hostname in groups[service.group] - inventory_hostname in groups[service.group]

View File

@ -68,6 +68,7 @@
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
name: "{{ item.value.container_name }}" name: "{{ item.value.container_name }}"
image: "{{ item.value.image }}" image: "{{ item.value.image }}"
privileged: "{{ item.value.privileged | default(False) }}"
volumes: "{{ item.value.volumes }}" volumes: "{{ item.value.volumes }}"
register: check_sahara_containers register: check_sahara_containers
when: when: