From c37c1a58798bd6dacc17c9e6b0e37de835b461a4 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 22 Feb 2017 05:11:59 +0000 Subject: [PATCH] ironic-dnsmasq should use ironic-inspector group 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 --- ansible/roles/ironic/tasks/config.yml | 1 + ansible/roles/ironic/tasks/pull.yml | 2 +- ansible/roles/ironic/tasks/start.yml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ansible/roles/ironic/tasks/config.yml b/ansible/roles/ironic/tasks/config.yml index cf3eecdf10..a878f32f7e 100644 --- a/ansible/roles/ironic/tasks/config.yml +++ b/ansible/roles/ironic/tasks/config.yml @@ -61,6 +61,7 @@ - "{{ node_custom_config }}/ironic/ironic-dnsmasq.conf" - "{{ node_custom_config }}/ironic/{{ inventory_hostname }}/ironic-dnsmasq.conf" - "ironic-dnsmasq.conf.j2" + when: inventory_hostname in groups['ironic-inspector'] - name: Copying pxelinux.cfg default template: diff --git a/ansible/roles/ironic/tasks/pull.yml b/ansible/roles/ironic/tasks/pull.yml index 36d896c081..8590ba0718 100644 --- a/ansible/roles/ironic/tasks/pull.yml +++ b/ansible/roles/ironic/tasks/pull.yml @@ -18,7 +18,7 @@ action: "pull_image" common_options: "{{ docker_common_options }}" image: "{{ ironic_dnsmasq_image_full }}" - when: inventory_hostname in groups['ironic-conductor'] + when: inventory_hostname in groups['ironic-inspector'] - name: Pulling ironic-inspector image kolla_docker: diff --git a/ansible/roles/ironic/tasks/start.yml b/ansible/roles/ironic/tasks/start.yml index 22195d4586..aacc9923e0 100644 --- a/ansible/roles/ironic/tasks/start.yml +++ b/ansible/roles/ironic/tasks/start.yml @@ -63,4 +63,4 @@ volumes: - "{{ node_config_directory }}/ironic-dnsmasq/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - when: inventory_hostname in groups['ironic-conductor'] + when: inventory_hostname in groups['ironic-inspector']