From aa04643dedec404c3601c1a1c08a8241c414fcd7 Mon Sep 17 00:00:00 2001 From: Matthew Thode Date: Fri, 18 Aug 2017 09:30:53 -0500 Subject: [PATCH] update tags the leap-upgrade use The comment on the bug in setuptools was fixed a while ago upstream and evrardjp also mentioned that comment could be removed. Branches other than newton have an EOL release, so change to use those. Change-Id: I80cf1fc929e86c3498760ad4b342964c7f82ea5f --- leap-upgrades/lib/vars.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/leap-upgrades/lib/vars.sh b/leap-upgrades/lib/vars.sh index 0fc054eb..a2010a0d 100644 --- a/leap-upgrades/lib/vars.sh +++ b/leap-upgrades/lib/vars.sh @@ -19,11 +19,11 @@ export DEBUG="${DEBUG:-TRUE}" export DEBUG_PATH="${DEBUG_PATH:-/tmp/run_debug}" ## Script Vars --------------------------------------------------------------- -export JUNO_RELEASE="${JUNO_RELEASE:-10.1.14}" -export KILO_RELEASE="${KILO_RELEASE:-11.2.17}" -export LIBERTY_RELEASE="${LIBERTY_RELEASE:-12.2.8}" -export MITAKA_RELEASE="${MITAKA_RELEASE:-13.3.11}" -export NEWTON_RELEASE="${NEWTON_RELEASE:-14.2.3}" # commit used due to packaging bug caused by setuptools +export JUNO_RELEASE="${JUNO_RELEASE:-eol-juno}" +export KILO_RELEASE="${KILO_RELEASE:-eol-kilo}" +export LIBERTY_RELEASE="${LIBERTY_RELEASE:-liberty-eol}" +export MITAKA_RELEASE="${MITAKA_RELEASE:-mitaka-eol}" +export NEWTON_RELEASE="${NEWTON_RELEASE:-14.2.7}" ## Environment Vars ------------------------------------------------------------------ export MAIN_PATH="${MAIN_PATH:-/opt/openstack-ansible}"