zuul/nodepool
Code Issues Proposed changes

Add diskimage-builder from git to dsvm job

Browse Source 
Add the option to install diskimage-builder from git, rather than pip,
so we can run this test against dib changes to see if we get something
useful.

Change-Id: I480dcb201aa93bc3d208e2bf5e96bcee6dd7df09
This commit is contained in:
Ian Wienand 2016-07-22 15:24:09 +10:00
parent d125986ac2
commit 5d2e09fac8
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
devstack/plugin.sh
View File

@ -29,11 +29,21 @@ function install_shade {
fi
}
function install_diskimage_builder {
if use_library_from_git "diskimage-builder"; then
GITREPO["diskimage-builder"]=$DISKIMAGE_BUILDER_REPO_URL
GITDIR["diskimage-builder"]=$DEST/diskimage-builder
GITBRANCH["diskimage-builder"]=$DISKIMAGE_BUILDER_REPO_REF
git_clone_by_name "diskimage-builder"
setup_dev_lib "diskimage-builder"
fi
}
# Install nodepool code
function install_nodepool {
# This function is currently blank because just installing a git
# tree does not require any additional code
install_shade
install_diskimage_builder
setup_develop $DEST/nodepool
}

3
devstack/settings
View File

@ -10,6 +10,9 @@ IMAGE_URLS+=",$NODEPOOL_IMAGE_URL"
SHADE_REPO_URL=${SHADE_REPO_URL:-https://git.openstack.org/openstack-infra/shade}
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}
enable_service geard
enable_service statsd
enable_service nodepool