From 0ce1716140e56ec03324705ef8d7a7b92387784d Mon Sep 17 00:00:00 2001 From: Sofer Athlan-Guyot Date: Wed, 1 Apr 2020 20:05:53 +0200 Subject: [PATCH] [TRAIN-ONLY] Fix systemd-wrapper integration during update. The anchor need to be attached directly to the entry for the reference to render properly the yaml task file. This is train only because the associated anchor is only created in this openstack version as it was required for the transition during update. Change-Id: I1c2624061aee9f56ef857cf88aa0954ad27f9758 Closes-Bug: #1870206 --- deployment/neutron/neutron-dhcp-container-puppet.yaml | 3 +-- deployment/neutron/neutron-l3-container-puppet.yaml | 3 +-- deployment/ovn/ovn-metadata-container-puppet.yaml | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/deployment/neutron/neutron-dhcp-container-puppet.yaml b/deployment/neutron/neutron-dhcp-container-puppet.yaml index 114d7cfeb5..d637ea8f83 100644 --- a/deployment/neutron/neutron-dhcp-container-puppet.yaml +++ b/deployment/neutron/neutron-dhcp-container-puppet.yaml @@ -422,8 +422,7 @@ outputs: state: yes update_tasks: - when: step|int == 1 - block: - <<: *dhcp_wrapper_tasks + block: *dhcp_wrapper_tasks upgrade_tasks: [] fast_forward_upgrade_tasks: - when: diff --git a/deployment/neutron/neutron-l3-container-puppet.yaml b/deployment/neutron/neutron-l3-container-puppet.yaml index 6e9b762785..227bfcff2a 100644 --- a/deployment/neutron/neutron-l3-container-puppet.yaml +++ b/deployment/neutron/neutron-l3-container-puppet.yaml @@ -378,8 +378,7 @@ outputs: state: yes update_tasks: - when: step|int == 1 - block: - <<: *l3_wrapper_tasks + block: *l3_wrapper_tasks upgrade_tasks: [] fast_forward_upgrade_tasks: - when: diff --git a/deployment/ovn/ovn-metadata-container-puppet.yaml b/deployment/ovn/ovn-metadata-container-puppet.yaml index 233050d50a..385639d4e5 100644 --- a/deployment/ovn/ovn-metadata-container-puppet.yaml +++ b/deployment/ovn/ovn-metadata-container-puppet.yaml @@ -360,6 +360,5 @@ outputs: setype: svirt_sandbox_file_t update_tasks: - when: step|int == 1 - block: - <<: *ovn_wrapper_tasks + block: *ovn_wrapper_tasks upgrade_tasks: []