X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=extraconfig%2Ftasks%2Fmajor_upgrade_pacemaker_init.yaml;h=623549a085e86583e2f8409c9268f35df13dcb7e;hb=017334bbb5978ed9a9c06f4595506612287c1b14;hp=f662bc3def6f6a86dfb2cfb200186312b84cf9bf;hpb=60fb98f274a0fdcef6c24bf98a8e36ea8ab4ea5f;p=apex-tripleo-heat-templates.git

diff --git a/extraconfig/tasks/major_upgrade_pacemaker_init.yaml b/extraconfig/tasks/major_upgrade_pacemaker_init.yaml
index f662bc3d..623549a0 100644
--- 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: