openstack/kolla-ansible
Code Issues Proposed changes

Merge "Add cap NET_ADMIN for ironic_dnsmasq"

Browse Source
This commit is contained in:
Zuul 2018-05-03 14:46:13 +00:00 committed by Gerrit Code Review
commit f27ca1a395
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/ironic/defaults/main.yml
View File

@ -51,6 +51,8 @@ ironic_services:
container_name: ironic_dnsmasq container_name: ironic_dnsmasq
group: ironic-inspector group: ironic-inspector
enabled: true enabled: true
cap_add:
- NET_ADMIN
image: "{{ ironic_dnsmasq_image_full }}" image: "{{ ironic_dnsmasq_image_full }}"
volumes: volumes:
- "{{ node_config_directory }}/ironic-dnsmasq/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/ironic-dnsmasq/:{{ container_config_directory }}/:ro"

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

@ -103,6 +103,7 @@
name: "{{ service.container_name }}" name: "{{ service.container_name }}"
image: "{{ service.image }}" image: "{{ service.image }}"
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
cap_add: "{{ service.cap_add }}"
when: when:
- action != "config" - action != "config"
- inventory_hostname in groups[service.group] - inventory_hostname in groups[service.group]

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

@ -196,6 +196,7 @@
name: "{{ item.value.container_name }}" name: "{{ item.value.container_name }}"
image: "{{ item.value.image }}" image: "{{ item.value.image }}"
privileged: "{{ item.value.privileged|default(False) }}" privileged: "{{ item.value.privileged|default(False) }}"
cap_add: "{{ item.value.cap_add|default([]) }}"
volumes: "{{ item.value.volumes }}" volumes: "{{ item.value.volumes }}"
register: check_ironic_containers register: check_ironic_containers
when: when: