From 1fd0f80b1b8f857033154755b8d6d4157af76022 Mon Sep 17 00:00:00 2001
From: Matthew Thode <mthode@mthode.org>
Date: Mon, 21 Aug 2017 20:06:46 -0500
Subject: [PATCH] Fix venv building for new tags

more headers were needed, also, revert the kilo release change.
eol-kilo has swift in upper-constraints, which causes problems for venv
building, it was removed from future releases for this exactly this
reason.

Change-Id: I1f8c8ea4681ab63dd67851235f405d1cbd478eae
---
 leap-upgrades/lib/functions.sh | 2 +-
 leap-upgrades/lib/vars.sh      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/leap-upgrades/lib/functions.sh b/leap-upgrades/lib/functions.sh
index e49ec72f..5bf07e08 100644
--- a/leap-upgrades/lib/functions.sh
+++ b/leap-upgrades/lib/functions.sh
@@ -428,7 +428,7 @@ function build_venv {
     fi
 
     # install ldap and sasl headers for pyldap (or ldap-python)
-    apt-get -y install libldap2-dev libsasl2-dev
+    apt-get -y install libldap2-dev libsasl2-dev libxml2-dev libxslt1-dev
 
     ### The venv build is done using a modern version of the py_pkgs plugin which collects all versions of
     ###  the OpenStack components from a given release. This creates 1 large venv per migratory release.
diff --git a/leap-upgrades/lib/vars.sh b/leap-upgrades/lib/vars.sh
index a2010a0d..51850d8b 100644
--- a/leap-upgrades/lib/vars.sh
+++ b/leap-upgrades/lib/vars.sh
@@ -20,7 +20,7 @@ export DEBUG_PATH="${DEBUG_PATH:-/tmp/run_debug}"
 
 ## Script Vars ---------------------------------------------------------------
 export JUNO_RELEASE="${JUNO_RELEASE:-eol-juno}"
-export KILO_RELEASE="${KILO_RELEASE:-eol-kilo}"
+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}"
 export MITAKA_RELEASE="${MITAKA_RELEASE:-mitaka-eol}"
 export NEWTON_RELEASE="${NEWTON_RELEASE:-14.2.7}"