From 2ec3466ad8875572a7bad42902127983fffd3165 Mon Sep 17 00:00:00 2001 From: Antony Messerli Date: Wed, 28 Nov 2018 10:35:56 -0600 Subject: [PATCH] Allow the option to specify OSA git repo URL Given the leapfrog branches are all EOL and frozen, an operator may need to make changes to branches on a local repo in order to combat bit rot over time. Change-Id: Ia8214a273b38418808b063b0192bbf81bf455daf --- leap-upgrades/lib/functions.sh | 2 +- leap-upgrades/lib/vars.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/leap-upgrades/lib/functions.sh b/leap-upgrades/lib/functions.sh index f6a096f9..f2d7dd04 100644 --- a/leap-upgrades/lib/functions.sh +++ b/leap-upgrades/lib/functions.sh @@ -415,7 +415,7 @@ function run_items { function clone_release { # If the git directory is not present clone the source into place at the given directory if [[ ! -d "/opt/leap42/openstack-ansible-base/.git" ]]; then - git clone https://git.openstack.org/openstack/openstack-ansible "/opt/leap42/openstack-ansible-base" + git clone ${OSA_REPO_URL} "/opt/leap42/openstack-ansible-base" fi # The clone release function clones everything from upstream into the leap42 directory as needed. diff --git a/leap-upgrades/lib/vars.sh b/leap-upgrades/lib/vars.sh index 05e6be42..1f1e24d8 100644 --- a/leap-upgrades/lib/vars.sh +++ b/leap-upgrades/lib/vars.sh @@ -19,6 +19,7 @@ export DEBUG="${DEBUG:-TRUE}" export DEBUG_PATH="${DEBUG_PATH:-/tmp/run_debug}" ## Script Vars --------------------------------------------------------------- +export OSA_REPO_URL="${OSA_REPO_URL:-https://git.openstack.org/openstack/openstack-ansible}" export JUNO_RELEASE="${JUNO_RELEASE:-eol-juno}" export KILO_RELEASE="${KILO_RELEASE:-11.2.17}" # eol-kilo has swift in upper-constraints, preventing venv building export LIBERTY_RELEASE="${LIBERTY_RELEASE:-liberty-eol}"