openstack/devstack
Code Issues Proposed changes

Install dib from pip

Browse Source 
diskimage-builder makes releases to PyPI and is not part of the
integrated release. Since it's not, we don't need to consume its
master branch - rather, we can consume its releases.

Change-Id: If9297a28604612140c39dfe44e77107d1372f0bb
This commit is contained in:
Monty Taylor 2014-09-30 09:53:34 -07:00
parent 8e087fa83b
commit 50495b0163
2 changed files with 1 additions and 8 deletions

5
lib/dib

@ -32,10 +32,7 @@ OAC_DIR=$DEST/os-apply-config
# install_dib() - Collect source and prepare # install_dib() - Collect source and prepare
function install_dib { function install_dib {
git_clone $DIB_REPO $DIB_DIR $DIB_BRANCH pip_install diskimage-builder
pushd $DIB_DIR
pip_install ./
popd
git_clone $TIE_REPO $TIE_DIR $TIE_BRANCH git_clone $TIE_REPO $TIE_DIR $TIE_BRANCH
git_clone $OCC_REPO $OCC_DIR $OCC_BRANCH git_clone $OCC_REPO $OCC_DIR $OCC_BRANCH

4
stackrc

@ -136,10 +136,6 @@ CINDER_BRANCH=${CINDER_BRANCH:-master}
CINDERCLIENT_REPO=${CINDERCLIENT_REPO:-${GIT_BASE}/openstack/python-cinderclient.git} CINDERCLIENT_REPO=${CINDERCLIENT_REPO:-${GIT_BASE}/openstack/python-cinderclient.git}
CINDERCLIENT_BRANCH=${CINDERCLIENT_BRANCH:-master} CINDERCLIENT_BRANCH=${CINDERCLIENT_BRANCH:-master}
# diskimage-builder
DIB_REPO=${DIB_REPO:-${GIT_BASE}/openstack/diskimage-builder.git}
DIB_BRANCH=${DIB_BRANCH:-master}
# image catalog service # image catalog service
GLANCE_REPO=${GLANCE_REPO:-${GIT_BASE}/openstack/glance.git} GLANCE_REPO=${GLANCE_REPO:-${GIT_BASE}/openstack/glance.git}
GLANCE_BRANCH=${GLANCE_BRANCH:-master} GLANCE_BRANCH=${GLANCE_BRANCH:-master}