diff options
| -rw-r--r-- | ansible/roles/ironic/defaults/main.yml | 6 | ||||
| -rw-r--r-- | zuul.d/scenarios/ironic.yaml | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ansible/roles/ironic/defaults/main.yml b/ansible/roles/ironic/defaults/main.yml index 12ee3a185..0a9281e65 100644 --- a/ansible/roles/ironic/defaults/main.yml +++ b/ansible/roles/ironic/defaults/main.yml @@ -54,7 +54,7 @@ ironic_services: # NOTE(mgoddard): This container is always enabled, since may be used by # the direct deploy driver. enabled: true - image: "{{ ironic_pxe_image_full }}" + image: "{{ ironic_http_image_full }}" volumes: "{{ ironic_http_default_volumes + ironic_http_extra_volumes }}" dimensions: "{{ ironic_http_dimensions }}" healthcheck: "{{ ironic_http_healthcheck }}" @@ -146,6 +146,10 @@ ironic_prometheus_exporter_image: "{{ docker_image_url }}ironic-prometheus-expor ironic_prometheus_exporter_tag: "{{ ironic_tag }}" ironic_prometheus_exporter_image_full: "{{ ironic_prometheus_exporter_image }}:{{ ironic_prometheus_exporter_tag }}" +ironic_http_image: "{{ docker_image_url }}httpd" +ironic_http_tag: "{{ ironic_tag }}" +ironic_http_image_full: "{{ ironic_http_image }}:{{ ironic_http_tag }}" + ironic_api_dimensions: "{{ default_container_dimensions }}" ironic_conductor_dimensions: "{{ default_container_dimensions }}" ironic_tftp_dimensions: "{{ default_container_dimensions }}" diff --git a/zuul.d/scenarios/ironic.yaml b/zuul.d/scenarios/ironic.yaml index 4db5f1501..4e76cc808 100644 --- a/zuul.d/scenarios/ironic.yaml +++ b/zuul.d/scenarios/ironic.yaml @@ -17,6 +17,7 @@ scenario: ironic scenario_images_extra: - ^dnsmasq + - ^httpd - ^ironic - ^iscsid - ^prometheus |