add lib/infra
move the infrastructure projects to a dedicated lib/infra, which
gives us access to this during grenade upgrade tests.
Change-Id: I1e832792b61d41ad290b4b2ab26fe664e710cebd
diff --git a/stack.sh b/stack.sh
index ed6afab..c5e306e 100755
--- a/stack.sh
+++ b/stack.sh
@@ -299,6 +299,7 @@
# Source project function libraries
source $TOP_DIR/lib/tls
+source $TOP_DIR/lib/infra
source $TOP_DIR/lib/oslo
source $TOP_DIR/lib/horizon
source $TOP_DIR/lib/keystone
@@ -314,8 +315,6 @@
# Set the destination directories for other OpenStack projects
OPENSTACKCLIENT_DIR=$DEST/python-openstackclient
-PBR_DIR=$DEST/pbr
-
# Interactive Configuration
# -------------------------
@@ -588,6 +587,8 @@
install_neutron_agent_packages
fi
+# Unbreak the giant mess that is the current state of setuptools
+unfubar_setuptools
# System-specific preconfigure
# ============================
@@ -658,9 +659,8 @@
echo_summary "Installing OpenStack project source"
-# Install pbr
-git_clone $PBR_REPO $PBR_DIR $PBR_BRANCH
-setup_develop $PBR_DIR
+# Install required infra support libraries
+install_infra
# Install oslo libraries that have graduated
install_oslo