Install DIB from source so depends-on will work
Depends-On: Ia1028972bfc0517b468b279aab9decdbcd7424ca Change-Id: I1c5e5558cac6d54fdc5730599293852f0abd0749
This commit is contained in:
parent
f00eccfafb
commit
78d7aec1fd
@ -5,7 +5,6 @@
|
||||
GET_PIP_CACHE_LOCATION=/opt/stack/cache/files/get-pip.py
|
||||
|
||||
function octavia_install {
|
||||
|
||||
setup_develop $OCTAVIA_DIR
|
||||
if [ $OCTAVIA_NODE == 'main' ] || [ $OCTAVIA_NODE == 'standalone' ] ; then
|
||||
if ! [ "$DISABLE_AMP_IMAGE_BUILD" == 'True' ]; then
|
||||
@ -21,6 +20,16 @@ function octavia_install {
|
||||
fi
|
||||
}
|
||||
|
||||
function install_diskimage_builder {
|
||||
if use_library_from_git "diskimage-builder"; then
|
||||
GITREPO["diskimage-builder"]=$DISKIMAGE_BUILDER_REPO_URL
|
||||
GITDIR["diskimage-builder"]=$DISKIMAGE_BUILDER_DIR
|
||||
GITBRANCH["diskimage-builder"]=$DISKIMAGE_BUILDER_REPO_REF
|
||||
git_clone_by_name "diskimage-builder"
|
||||
setup_dev_lib "diskimage-builder"
|
||||
fi
|
||||
}
|
||||
|
||||
function set_octavia_worker_image_owner_id {
|
||||
image_id=$(openstack image list --property name=${OCTAVIA_AMP_IMAGE_NAME} -f value -c ID)
|
||||
owner_id=$(openstack image show ${image_id} -c owner -f value)
|
||||
@ -28,6 +37,8 @@ function set_octavia_worker_image_owner_id {
|
||||
}
|
||||
|
||||
function build_octavia_worker_image {
|
||||
# set up diskimage-builder if we need to
|
||||
install_diskimage_builder
|
||||
|
||||
# pull the agent code from the current code zuul has a reference to
|
||||
if [ -n "$DIB_REPOLOCATION_pip_and_virtualenv" ]; then
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
OCTAVIA=${OCTAVIA:-"octavia"}
|
||||
OCTAVIA_DIR=${OCTAVIA_DIR:-"${DEST}/octavia"}
|
||||
DISKIMAGE_BUILDER_REPO=${DISKIMAGE_BUILDER_REPO:-${GIT_BASE}/openstack/diskimage-builder.git}
|
||||
DISKIMAGE_BUILDER_BRANCH=${DISKIMAGE_BUILDER_BRANCH:-master}
|
||||
DISKIMAGE_BUILDER_REPO_URL=${DISKIMAGE_BUILDER_REPO_URL:-${GIT_BASE}/openstack/diskimage-builder.git}
|
||||
DISKIMAGE_BUILDER_REPO_REF=${DISKIMAGE_BUILDER_REPO_REF:-master}
|
||||
DISKIMAGE_BUILDER_DIR=$DEST/diskimage-builder
|
||||
OCTAVIA_BIN_DIR=${OCTAVIA_BIN_DIR:-$(get_python_exec_prefix)}
|
||||
OCTAVIA_CONF_DIR=${OCTAVIA_CONF_DIR:-"/etc/octavia"}
|
||||
|
@ -23,6 +23,11 @@ export DEVSTACK_LOCAL_CONFIG+="
|
||||
enable_plugin barbican https://git.openstack.org/openstack/barbican
|
||||
"
|
||||
|
||||
# Allow testing against diskimage-builder changes with depends-on
|
||||
export DEVSTACK_LOCAL_CONFIG+="
|
||||
LIBS_FROM_GIT+=diskimage-builder
|
||||
"
|
||||
|
||||
# Sort out our gate args
|
||||
. $(dirname "$0")/decode_args.sh
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user