From 1986b06d8f2b21ca3bb76829715a15c388b91728 Mon Sep 17 00:00:00 2001
From: Jimmy McCrory <jimmy.mccrory@gmail.com>
Date: Thu, 1 Jun 2017 14:17:04 -0700
Subject: [PATCH] Unset group and host vars variables during upgrade

Unset environment variables used by the override_folder plugin to set
paths for group and host vars since the default locations have changed
between Ocata and Pike.

Change-Id: I13c9ab9e55de25c4a70bc74f47ce489085c61bf5
---
 scripts/gate-check-commit.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scripts/gate-check-commit.sh b/scripts/gate-check-commit.sh
index 6d9034e354..4f477ca8ad 100755
--- a/scripts/gate-check-commit.sh
+++ b/scripts/gate-check-commit.sh
@@ -183,6 +183,12 @@ if [[ "${ACTION}" == "upgrade" ]]; then
     unset ANSIBLE_PACKAGE
     unset UPPER_CONSTRAINTS_FILE
 
+    # Unset environment variables used by the override_folder
+    # plugin to set paths for group and host vars since the
+    # default locations have changed between Ocata and Pike.
+    unset GROUP_VARS_PATH
+    unset HOST_VARS_PATH
+
     # To execute the upgrade script we need to provide
     # an affirmative response to the warning that the
     # upgrade is irreversable.