Merge "[ffwd3] Upgrade ovn_controller ahead" into stable/wallaby

deployment/ovn/ovn-controller-container-puppet.yaml

@@ -514,7 +514,7 @@ outputs:
                       $ROLE_NAME: {get_param: RoleName}
                 ovn_bridge_mappings: {get_attr: [OVNBridgeMappingsValue, value, ovn_bridge_mappings]}
                 ovn_static_bridge_mac_mappings: {get_attr: [OVNBridgeMappingsValue, value, ovn_static_bridge_mac_mappings]}
-      external_update_tasks:
+      external_update_tasks: &ovn_controller_update
         - name: Force pull image in case image name doesn't change.
           when: step|int == 1
           tags:
@@ -641,7 +641,7 @@ outputs:
           until: async_poll_results.finished
           retries: {get_param: OVNControllerUpdateTimeout}
           delay: 1
-      upgrade_tasks: []
+      upgrade_tasks: *ovn_controller_update
       scale_tasks:
         - when:
             - step|int == 1