Browse code

Merge "Add pbr to devstack."

Jenkins authored on 2013/05/10 06:58:20
Showing 2 changed files
... ...
@@ -282,6 +282,7 @@ source $TOP_DIR/lib/ldap
282 282
 
283 283
 # Set the destination directories for OpenStack projects
284 284
 OPENSTACKCLIENT_DIR=$DEST/python-openstackclient
285
+PBR_DIR=$DEST/pbr
285 286
 
286 287
 
287 288
 # Interactive Configuration
... ...
@@ -619,6 +620,10 @@ fi
619 619
 
620 620
 echo_summary "Installing OpenStack project source"
621 621
 
622
+# Install pbr
623
+git_clone $PBR_REPO $PBR_DIR $PBR_BRANCH
624
+setup_develop $PBR_DIR
625
+
622 626
 # Install clients libraries
623 627
 install_keystoneclient
624 628
 install_glanceclient
... ...
@@ -157,6 +157,11 @@ BM_IMAGE_BUILD_BRANCH=${BM_IMAGE_BUILD_BRANCH:-master}
157 157
 BM_POSEUR_REPO=${BM_POSEUR_REPO:-${GIT_BASE}/tripleo/bm_poseur.git}
158 158
 BM_POSEUR_BRANCH=${BM_POSEUR_BRANCH:-master}
159 159
 
160
+# pbr
161
+# Used to drive the setuptools configs
162
+PBR_REPO=${PBR_REPO:-${GIT_BASE}/openstack-dev/pbr.git}
163
+PBR_BRANCH=${PBR_BRANCH:-master}
164
+
160 165
 # Nova hypervisor configuration.  We default to libvirt with **kvm** but will
161 166
 # drop back to **qemu** if we are unable to load the kvm module.  ``stack.sh`` can
162 167
 # also install an **LXC** or **OpenVZ** based system.