Increase cluster sync timeout for M->N major upgrades

[apex-tripleo-heat-templates.git] / extraconfig / tasks / major_upgrade_pacemaker_init.yaml

diff --git a/extraconfig/tasks/major_upgrade_pacemaker_init.yaml b/extraconfig/tasks/major_upgrade_pacemaker_init.yaml
index f662bc3..623549a 100644 (file)
--- a/extraconfig/tasks/major_upgrade_pacemaker_init.yaml
+++ b/extraconfig/tasks/major_upgrade_pacemaker_init.yaml
@@ -30,6 +30,8 @@ parameters:
 
 resources:
 
+  # For the UpgradeInit also rename /etc/resolv.conf.save for +bug/1567004
+
   UpgradeInitConfig:
     type: OS::Heat::SoftwareConfig
     properties:
@@ -38,6 +40,7 @@ resources:
         list_join:
         - ''
         - - "#!/bin/bash\n\n"
+          - "if [[ -f /etc/resolv.conf.save ]] ; then rm /etc/resolv.conf.save; fi\n\n"
           - get_param: UpgradeInitCommand
 
   UpgradeInitControllerDeployment: