openstack/kolla-ansible
Code Issues Proposed changes

Add cap NET_ADMIN for ironic_dnsmasq

Browse Source 
When attempting to inspect a node with ironic, it seems at times
ironic_dnsmasq fails to process dhcp bootp requests, giving the
following error repeating:

dnsmasq-dhcp: DHCPDISCOVER(eth0) 52:54:00:ff:15:55
dnsmasq-dhcp: DHCPOFFER(eth0) 192.169.5.100 52:54:00:ff:15:55
dnsmasq-dhcp: ARP-cache injection failed: Operation not permitted

Adding NET_ADMIN fixes this.

Co-Authored-By: Mark Goddard <mark@stackhpc.com>
Closes-Bug: #1762805
Change-Id: I39acb81801710f849336380d3fde01c70cd8d8ce
This commit is contained in:
Paul Bourke 2018-04-10 19:24:29 +01:00
parent 12791731c8
commit c96fe4146e
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: