openstack/kolla-ansible
Code Issues Proposed changes

ironic-dnsmasq should use ironic-inspector group

Browse Source 
The ironic_dnsmasq container is currently tied to the ironic-conductor
Ansible group. It is required only for Ironic inspector and should
really either be tied to the ironic-inspector group or have a new
ironic-dnsmasq group defined for it. This problem means that if all
hosts are removed from the ironic-inspector group I will still have an
ironic_dnsmasq container deployed.

This change uses the ironic-inspector group to determine where to place
the ironic_dnsmasq container.

Change-Id: I6af3f402795107b8b9d7a1619722f12cbf496257
Closes-Bug: #1666982
This commit is contained in:
Mark Goddard 2017-02-22 05:11:59 +00:00
parent cb5a2878ee
commit c37c1a5879
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,6 +61,7 @@
- "{{ node_custom_config }}/ironic/ironic-dnsmasq.conf" - "{{ node_custom_config }}/ironic/ironic-dnsmasq.conf"
- "{{ node_custom_config }}/ironic/{{ inventory_hostname }}/ironic-dnsmasq.conf" - "{{ node_custom_config }}/ironic/{{ inventory_hostname }}/ironic-dnsmasq.conf"
- "ironic-dnsmasq.conf.j2" - "ironic-dnsmasq.conf.j2"
when: inventory_hostname in groups['ironic-inspector']
- name: Copying pxelinux.cfg default - name: Copying pxelinux.cfg default
template: template:

2
ansible/roles/ironic/tasks/pull.yml
View File

@ -18,7 +18,7 @@
action: "pull_image" action: "pull_image"
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
image: "{{ ironic_dnsmasq_image_full }}" image: "{{ ironic_dnsmasq_image_full }}"
when: inventory_hostname in groups['ironic-conductor'] when: inventory_hostname in groups['ironic-inspector']
- name: Pulling ironic-inspector image - name: Pulling ironic-inspector image
kolla_docker: kolla_docker:

2
ansible/roles/ironic/tasks/start.yml
View File

@ -63,4 +63,4 @@
volumes: volumes:
- "{{ node_config_directory }}/ironic-dnsmasq/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/ironic-dnsmasq/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
when: inventory_hostname in groups['ironic-conductor'] when: inventory_hostname in groups['ironic-inspector']