openstack/devstack
Code Issues Proposed changes

Merge "Add pbr to devstack."

Browse Source
This commit is contained in:
Jenkins 2013-05-09 21:58:20 +00:00 committed by Gerrit Code Review
commit 5f349179f4
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
stack.sh
View File

@ -282,6 +282,7 @@ source $TOP_DIR/lib/ldap
# Set the destination directories for OpenStack projects # Set the destination directories for OpenStack projects
OPENSTACKCLIENT_DIR=$DEST/python-openstackclient OPENSTACKCLIENT_DIR=$DEST/python-openstackclient
PBR_DIR=$DEST/pbr
# Interactive Configuration # Interactive Configuration
@ -619,6 +620,10 @@ fi
echo_summary "Installing OpenStack project source" echo_summary "Installing OpenStack project source"
# Install pbr
git_clone $PBR_REPO $PBR_DIR $PBR_BRANCH
setup_develop $PBR_DIR
# Install clients libraries # Install clients libraries
install_keystoneclient install_keystoneclient
install_glanceclient install_glanceclient

5
stackrc
View File

@ -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_REPO=${BM_POSEUR_REPO:-${GIT_BASE}/tripleo/bm_poseur.git}
BM_POSEUR_BRANCH=${BM_POSEUR_BRANCH:-master} 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 # 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 # drop back to **qemu** if we are unable to load the kvm module. ``stack.sh`` can
# also install an **LXC** or **OpenVZ** based system. # also install an **LXC** or **OpenVZ** based system.