zuul/nodepool
Code Issues Proposed changes

Add glean libs-from-git install

Browse Source 
Change I1479c5ff5e548da559be6dc8eb51d9635a0e2c7e has added glean as
lib-from-git install, but we're not installing it in the plugin.  Add
it.

Change-Id: I144cbef93a0831cbe21b77d499130cedc2d6cc7f
This commit is contained in:
Ian Wienand 2016-12-21 21:26:30 +11:00
parent fd296c868b
commit c13951e0d8
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
devstack/plugin.sh
View File

@ -48,11 +48,24 @@ function install_diskimage_builder {
fi
}
function install_glean {
if use_library_from_git "glean"; then
GITREPO["glean"]=$GLEAN_REPO_URL
GITDIR["glean"]=$DEST/glean
GITBRANCH["glean"]=$GLEAN_REPO_REF
git_clone_by_name "glean"
setup_dev_lib "glean"
$NODEPOOL_INSTALL/bin/pip install -e $DEST/glean
fi
}
# Install nodepool code
function install_nodepool {
virtualenv $NODEPOOL_INSTALL
install_shade
install_diskimage_builder
install_glean
setup_develop $DEST/nodepool
$NODEPOOL_INSTALL/bin/pip install -e $DEST/nodepool

3
devstack/settings
View File

@ -18,6 +18,9 @@ SHADE_REPO_REF=${SHADE_REPO_REF:-master}
DISKIMAGE_BUILDER_REPO_URL=${DISKIMAGE_BUILDER_REPO_URL:-https://git.openstack.org/openstack/diskimage-builder}
DISKIMAGE_BUILDER_REPO_REF=${DISKIMAGE_BUILDER_REPO_REF:-master}
GLEAN_REPO_URL=${GLEAN_REPO_URL:-https://git.openstack.org/openstack/glean}
GLEAN_REPO_REF=${GLEAN_REPO_REF:-master}
enable_service geard
enable_service statsd
enable_service nodepool