Merge "Re-implement keepalived restart without pre_deploy"

docker/services/keepalived.yaml

@@ -40,6 +40,12 @@ parameters:
     default: false
     description: Remove package if the service is being disabled during upgrade
     type: boolean
+  # TODO(emilien) Remove when Keepalived 2.0.6 is out
+  # https://bugs.launchpad.net/tripleo/+bug/1791238
+  KeepalivedRestart:
+    default: false
+    description: Whether or not restart Keepalived. Useful for Undercloud only.
+    type: boolean
 
 resources:
 
@@ -104,6 +110,13 @@ outputs:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
             command: /usr/local/bin/kolla_start
       host_prep_tasks:
+        - name: Set fact for restarting Keepalived container
+          set_fact:
+            restart_keepalived: {get_param: KeepalivedRestart}
+        - name: Restart Keepalived container
+          shell: "{{container_cli}} restart keepalived"
+          when: restart_keepalived|bool
+          ignore_errors: True
         - name: load ip_vs module
           import_role:
             name: tripleo-module-load

environments/undercloud.yaml

@@ -2,7 +2,6 @@ resource_registry:
   OS::TripleO::Network::Ports::RedisVipPort: ../network/ports/noop.yaml
   OS::TripleO::Network::Ports::ControlPlaneVipPort: ../deployed-server/deployed-neutron-port.yaml
   OS::TripleO::Undercloud::Net::SoftwareConfig: ../net-config-undercloud.yaml
-  OS::TripleO::NodeExtraConfig: ../extraconfig/pre_deploy/undercloud_pre.yaml
   OS::TripleO::NodeExtraConfigPost: ../extraconfig/post_deploy/undercloud_post.yaml
   OS::TripleO::Services::DockerRegistry: ../puppet/services/docker-registry.yaml
   OS::TripleO::Services::ContainerImagePrepare: ../puppet/services/container-image-prepare.yaml
@@ -154,3 +153,6 @@ parameter_defaults:
     - /usr/share/openstack-octavia-amphora-images:/usr/share/openstack-octavia-amphora-images:ro
   NeutronMetadataProxySharedSecret: ''
   MetadataNATRule: true
+  # TODO(emilien) Remove when Keepalived 2.0.6 is out
+  # https://bugs.launchpad.net/tripleo/+bug/1791238
+  KeepalivedRestart: true

extraconfig/pre_deploy/undercloud_pre.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# This needs to be run after os-net-config. since os-net-config potentially can
-# restart network interfaces, which would affects VIPs controlled by
-# keepalived.
-
-# TODO(hjensas): Remove this when we have keepalived 2.0.6 or later.
-docker container restart keepalived || true

extraconfig/pre_deploy/undercloud_pre.yaml

@@ -1,23 +0,0 @@
-heat_template_version: rocky
-
-description: >
-  Pre-deployment for the TripleO undercloud
-
-parameters:
-  server:
-    type: string
-
-resources:
-
-  UndercloudPreConfig:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: script
-      config: {get_file: ./undercloud_pre.sh}
-
-  UndercloudPreDeployment:
-    type: OS::Heat::SoftwareDeployment
-    properties:
-      name: UndercloudPreDeployment
-      server:  {get_param: server}
-      config: {get_resource: UndercloudPreConfig}