From 5e159496b88772a20102b646d02ed4cc13b15f7a Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Wed, 8 May 2013 14:29:52 -0400 Subject: [PATCH] Add pbr to devstack. It's being used in all of the core projects, so we should install it at the start so we can ensure that we don't break everything all at once. Change-Id: I326d724264803e88315ee9e40f4634836baf6e0b --- stack.sh | 5 +++++ stackrc | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/stack.sh b/stack.sh index 32a7d747ba..63a87b9cdf 100755 --- a/stack.sh +++ b/stack.sh @@ -273,6 +273,7 @@ source $TOP_DIR/lib/ldap # Set the destination directories for OpenStack projects OPENSTACKCLIENT_DIR=$DEST/python-openstackclient +PBR_DIR=$DEST/pbr # Interactive Configuration @@ -610,6 +611,10 @@ fi echo_summary "Installing OpenStack project source" +# Install pbr +git_clone $PBR_REPO $PBR_DIR $PBR_BRANCH +setup_develop $PBR_DIR + # Install clients libraries install_keystoneclient install_glanceclient diff --git a/stackrc b/stackrc index f99eab1852..aaf17d1a86 100644 --- a/stackrc +++ b/stackrc @@ -157,6 +157,11 @@ BM_IMAGE_BUILD_BRANCH=${BM_IMAGE_BUILD_BRANCH:-master} BM_POSEUR_REPO=${BM_POSEUR_REPO:-${GIT_BASE}/tripleo/bm_poseur.git} BM_POSEUR_BRANCH=${BM_POSEUR_BRANCH:-master} +# pbr +# Used to drive the setuptools configs +PBR_REPO=${PBR_REPO:-${GIT_BASE}/openstack-dev/pbr.git} +PBR_BRANCH=${PBR_BRANCH:-master} + # Nova hypervisor configuration. We default to libvirt with **kvm** but will # drop back to **qemu** if we are unable to load the kvm module. ``stack.sh`` can # also install an **LXC** or **OpenVZ** based system.