diff options
| author |   marios <marios@redhat.com> | 2016-04-07 16:39:46 +0300 |
|---|---|---|
| committer | marios <marios@redhat.com> | 2016-04-07 16:50:21 +0300 |
| commit | 706c2fe4b62f95ac13ee800fc08e549180afc810 (patch) | |
| tree | be9470071220b2f0d42b9d7ad9cb97cfa1f3a312 | |
| parent | 8557ab7123b4550d23c191ad0247e42e132419a3 (diff) | |
Add removal of the /etc/resolv.conf.save file for +bug/1567004
The change at https://review.openstack.org/#/c/302352/ should stop
the if up/down scripts from making changes to resolv.conf as
discussed in that review and the related bug below. However during
upgrades, as we are moving from a version of the ifcfg-vlanXX files
that don't have the PEERDNS=no added by /#/c/302352 the if up
script will restore the /etc/resolv.conf.save to /etc/resolv.conf
and overwrite it. This removes the .save file during the upgrade
init command which gets delivered to all nodes as the first stage
of a major upgrade.
Change-Id: I91dd139f43be4912c20d8661691bee2b662964d4
Related-Bug: 1567004
| -rw-r--r-- | extraconfig/tasks/major_upgrade_pacemaker_init.yaml | 3 |
1 files changed, 3 insertions, 0 deletions
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: |