From 82466fb716cd8f060564bdff5f6578a7dcbcfad6 Mon Sep 17 00:00:00 2001
From: Jimmy McCrory <jimmy.mccrory@gmail.com>
Date: Wed, 13 Jun 2018 16:20:20 -0700
Subject: [PATCH] Fix newton workaround variables

The pre and post lxc_cache_prep commands have been updated to reflect
the most recent upstream change[1]. 'lxc_cache_prep_post_commands' is
also now appended to 'user_workarounds_newton.yml' instead of
overwriting the file.

[1] I11d069e2d0cb3becad067689fa8f1e4c9391f368

Change-Id: Iedc98ba5b0585589421b97a3d6b583d38aa17383
---
 scripts/gate-check-commit.sh | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/scripts/gate-check-commit.sh b/scripts/gate-check-commit.sh
index 2f22f622a8..ca5f20d7f1 100755
--- a/scripts/gate-check-commit.sh
+++ b/scripts/gate-check-commit.sh
@@ -119,8 +119,23 @@ popd
 
 # Now add Newton EOL workarounds
 if [[ "${ACTION}" == "upgrade" ]]; then
-    echo 'lxc_cache_prep_pre_commands: "rm -f /etc/resolv.conf || true"' > /etc/openstack_deploy/user_workarounds_newton.yml
-    echo 'lxc_cache_prep_post_commands: "ln -s ../run/resolvconf/resolv.conf /etc/resolv.conf -f"' > /etc/openstack_deploy/user_workarounds_newton.yml
+
+cat > /etc/openstack_deploy/user_workarounds_newton.yml <<EOT
+lxc_cache_prep_pre_commands: |
+  if [ -f /etc/resolv.conf ] || [ -L /etc/resolv.conf ]; then
+    mv /etc/resolv.conf /etc/resolv.conf.org
+  fi
+EOT
+
+cat >> /etc/openstack_deploy/user_workarounds_newton.yml <<EOT
+lxc_cache_prep_post_commands: |
+  if [ -f /etc/resolv.conf.org ] || [ -L /etc/resolv.conf.org ]; then
+    mv /etc/resolv.conf.org /etc/resolv.conf
+  else
+    rm -f /etc/resolv.conf
+  fi
+EOT
+
 fi
 
 # Implement the log directory