Merge "ironic_dnsmasq doesn't support reconfiguration"

This commit is contained in:
Jenkins 2017-02-23 09:26:16 +00:00 committed by Gerrit Code Review
commit d734f162b0

@ -11,6 +11,7 @@
- { name: ironic_api, group: ironic-api }
- { name: ironic_conductor, group: ironic-conductor }
- { name: ironic_inspector, group: ironic-inspector }
- { name: ironic_dnsmasq, group: ironic-inspector }
- include: config.yml
@ -25,6 +26,7 @@
- { name: ironic_api, group: ironic-api }
- { name: ironic_conductor, group: ironic-conductor }
- { name: ironic_inspector, group: ironic-inspector }
- { name: ironic_dnsmasq, group: ironic-inspector }
- name: Containers config strategy
kolla_docker:
@ -37,6 +39,7 @@
- { name: ironic_api, group: ironic-api }
- { name: ironic_conductor, group: ironic-conductor }
- { name: ironic_inspector, group: ironic-inspector }
- { name: ironic_dnsmasq, group: ironic-inspector }
- name: Remove the containers
kolla_docker:
@ -51,7 +54,8 @@
- [{ name: ironic_pxe, group: ironic-pxe },
{ name: ironic_api, group: ironic-api },
{ name: ironic_conductor, group: ironic-conductor },
{ name: ironic_inspector, group: ironic-inspector }]
{ name: ironic_inspector, group: ironic-inspector },
{ name: ironic_dnsmasq, group: ironic-inspector }]
- "{{ container_envs.results }}"
- "{{ check_results.results }}"
@ -71,6 +75,7 @@
- [{ name: ironic_pxe, group: ironic-pxe },
{ name: ironic_api, group: ironic-api },
{ name: ironic_conductor, group: ironic-conductor },
{ name: ironic_inspector, group: ironic-inspector }]
{ name: ironic_inspector, group: ironic-inspector },
{ name: ironic_dnsmasq, group: ironic-inspector }]
- "{{ container_envs.results }}"
- "{{ check_results.results }}"