Merge "Ironic: rebootstrap ironic-pxe on upgrade" into stable/victoria

ansible/roles/ironic/tasks/bootstrap.yml

@@ -52,22 +52,3 @@
     - inventory_hostname in groups[item.group]
 
 - import_tasks: bootstrap_service.yml
-
-- name: Running Ironic-PXE bootstrap container
-  vars:
-    ironic_pxe: "{{ ironic_services['ironic-pxe'] }}"
-  become: true
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    detach: False
-    environment:
-      KOLLA_BOOTSTRAP:
-      KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
-    image: "{{ ironic_pxe.image }}"
-    labels:
-      BOOTSTRAP:
-    name: "bootstrap_ironic_pxe"
-    restart_policy: no
-    volumes: "{{ ironic_pxe.volumes }}"
-  when: inventory_hostname in groups[ironic_pxe.group]

ansible/roles/ironic/tasks/bootstrap_service.yml

@@ -44,3 +44,22 @@
   run_once: True
   delegate_to: "{{ groups[ironic_inspector.group][0] }}"
   when: inventory_hostname in groups[ironic_inspector.group]
+
+- name: Running Ironic-PXE bootstrap container
+  vars:
+    ironic_pxe: "{{ ironic_services['ironic-pxe'] }}"
+  become: true
+  kolla_docker:
+    action: "start_container"
+    common_options: "{{ docker_common_options }}"
+    detach: False
+    environment:
+      KOLLA_BOOTSTRAP:
+      KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
+    image: "{{ ironic_pxe.image }}"
+    labels:
+      BOOTSTRAP:
+    name: "bootstrap_ironic_pxe"
+    restart_policy: no
+    volumes: "{{ ironic_pxe.volumes }}"
+  when: inventory_hostname in groups[ironic_pxe.group]

releasenotes/notes/bug-1963752-ee12e15c17c24bb0.yaml

@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes an issue with Ironic's PXE components not getting updated on
+    upgrade.
+    `LP#1963752 <https://launchpad.net/bugs/1963752>`__