Merge "ironic-dnsmasq should use ironic-inspector group"

This commit is contained in:
Jenkins 2017-02-23 10:59:30 +00:00 committed by Gerrit Code Review
commit 8fbc0df4c9
3 changed files with 3 additions and 2 deletions

View File

@ -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:

View File

@ -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:

View File

@ -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']