Merge "mount /run in sahara-engine container"

This commit is contained in:
Jenkins 2017-05-04 06:40:27 +00:00 committed by Gerrit Code Review
commit b6d370ca43
3 changed files with 4 additions and 0 deletions

View File

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

View File

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

View File

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