From f5e74f065f268e3c9b3fcf619d8ba0029e245e3f Mon Sep 17 00:00:00 2001
From: Antony Messerli <amesserl@rackspace.com>
Date: Mon, 22 Jan 2018 12:58:36 -0600
Subject: [PATCH] Remove BOOTSTRAP_ANSIBLE_FOLDER variable

Removes the BOOTSTRAP_ANSIBLE_FOLDER variable because
the assumption was made that Ansible would always be
bootstrapped from /opt/openstack-ansible and setting
this would cause a noop when Ansible was bootstrapped.

Change-Id: I284ad62b6f14cc334ae949946e839a1e8ec6a1d8
---
 leap-upgrades/lib/functions.sh | 2 +-
 leap-upgrades/lib/vars.sh      | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/leap-upgrades/lib/functions.sh b/leap-upgrades/lib/functions.sh
index 81433857..0ee2eef6 100644
--- a/leap-upgrades/lib/functions.sh
+++ b/leap-upgrades/lib/functions.sh
@@ -151,7 +151,7 @@ function bootstrap_recent_ansible {
       notice "Removed System installed Ansible"
     done
 
-    pushd "${BOOTSTRAP_ANSIBLE_FOLDER}"
+    pushd /opt/openstack-ansible
       # Install ansible for system migrations
       scripts/bootstrap-ansible.sh
     popd
diff --git a/leap-upgrades/lib/vars.sh b/leap-upgrades/lib/vars.sh
index b63b31a9..4cd01a3a 100644
--- a/leap-upgrades/lib/vars.sh
+++ b/leap-upgrades/lib/vars.sh
@@ -42,9 +42,6 @@ export VENV_URL="${VENV_URL:-https://rpc-repo.rackspace.com/venvs/leap-bundles}"
 export VALIDATE_UPGRADE_INPUT="${VALIDATE_UPGRADE_INPUT:-TRUE}"
 export CODE_UPGRADE_FROM="${CODE_UPGRADE_FROM:-}"
 
-# Bootstrap ansible tool, see also bootstrap_recent_ansible
-export BOOTSTRAP_ANSIBLE_FOLDER=${BOOTSTRAP_ANSIBLE_FOLDER:-/opt/openstack-ansible/}
-
 ## Ansible debugging
 export LEAP_TIMESTAMP=$(date +%s)
 export ANSIBLE_LOG_PATH="/opt/leap42/ansible-${LEAP_TIMESTAMP}.log"