openstack/kolla-ansible
Code Issues Proposed changes

Merge "FIX inject password error"

Browse Source
This commit is contained in:
Zuul 2018-03-12 14:27:32 +00:00 committed by Gerrit Code Review
commit 9275ba878f
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/nova/defaults/main.yml
View File

@ -110,6 +110,8 @@ nova_services:
container_name: "nova_compute" container_name: "nova_compute"
group: "compute" group: "compute"
image: "{{ nova_compute_image_full }}" image: "{{ nova_compute_image_full }}"
environment:
LIBGUESTFS_BACKEND: "direct"
privileged: True privileged: True
enabled: "{{ not enable_nova_fake | bool }}" enabled: "{{ not enable_nova_fake | bool }}"
ipc_mode: "host" ipc_mode: "host"

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

@ -253,6 +253,7 @@
action: "recreate_or_restart_container" action: "recreate_or_restart_container"
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
name: "{{ service.container_name }}" name: "{{ service.container_name }}"
environment: "{{ service.environment | default(omit) }}"
image: "{{ service.image }}" image: "{{ service.image }}"
privileged: "{{ service.privileged | default(False) }}" privileged: "{{ service.privileged | default(False) }}"
ipc_mode: "{{ service.ipc_mode | default(omit) }}" ipc_mode: "{{ service.ipc_mode | default(omit) }}"

1
ansible/roles/nova/tasks/config.yml
View File

@ -190,6 +190,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 }}"
environment: "{{ item.value.environment|default(omit) }}"
pid_mode: "{{ item.value.pid_mode|default('') }}" pid_mode: "{{ item.value.pid_mode|default('') }}"
ipc_mode: "{{ item.value.ipc_mode|default(omit) }}" ipc_mode: "{{ item.value.ipc_mode|default(omit) }}"
privileged: "{{ item.value.privileged|default(False) }}" privileged: "{{ item.value.privileged|default(False) }}"