openstack
/
octavia
Code Issues Proposed changes

Merge "Remove install DIB from Git option" into stable/train

This commit is contained in:
Zuul 2020-07-17 20:17:01 +00:00 committed by Gerrit Code Review
parent f9ec1fdf77 d6a7eebb26
commit b20bdf16b5
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devstack/plugin.sh
View File

@ -38,10 +38,6 @@ function octavia_lib_install {
fi fi
} }
function install_diskimage_builder {
setup_dev_lib -bindep "diskimage-builder"
}
function set_octavia_worker_image_owner_id { function set_octavia_worker_image_owner_id {
image_id=$(openstack image list --property name=${OCTAVIA_AMP_IMAGE_NAME} -f value -c 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) owner_id=$(openstack image show ${image_id} -c owner -f value)
@ -49,9 +45,6 @@ function set_octavia_worker_image_owner_id {
} }
function build_octavia_worker_image { function build_octavia_worker_image {
# set up diskimage-builder if we need to
install_diskimage_builder
# Pull in DIB local elements if they are defined in devstack # Pull in DIB local elements if they are defined in devstack
if [ -n "$DIB_LOCAL_ELEMENTS" ]; then if [ -n "$DIB_LOCAL_ELEMENTS" ]; then
export DIB_LOCAL_ELEMENTS=$DIB_LOCAL_ELEMENTS export DIB_LOCAL_ELEMENTS=$DIB_LOCAL_ELEMENTS

1
zuul.d/jobs.yaml
View File

@ -5,7 +5,6 @@
required-projects: required-projects:
- openstack/devstack-gate - openstack/devstack-gate
- openstack/barbican - openstack/barbican
- openstack/diskimage-builder
- openstack/octavia - openstack/octavia
- openstack/octavia-lib - openstack/octavia-lib
- openstack/python-barbicanclient - openstack/python-barbicanclient