Merge "[TRAIN-ONLY] Fix systemd-wrapper integration during update." into stable/train

2020-04-03 18:06:14 +00:00 · 2020-04-03 18:06:14 +00:00 · 76488564e7
parent 7c63190a9a 0ce1716140
commit 76488564e7
3 changed files with 3 additions and 6 deletions
--- 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:
--- 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:
--- 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: []