Browse Source

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

changes/74/741974/1
Zuul 3 weeks ago
committed by Gerrit Code Review
parent
commit
b20bdf16b5
2 changed files with 0 additions and 8 deletions
  1. +0
    -7
      devstack/plugin.sh
  2. +0
    -1
      zuul.d/jobs.yaml

+ 0
- 7
devstack/plugin.sh View File

@@ -38,10 +38,6 @@ function octavia_lib_install {
fi
}

function install_diskimage_builder {
setup_dev_lib -bindep "diskimage-builder"
}

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)
@@ -49,9 +45,6 @@ function set_octavia_worker_image_owner_id {
}

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
if [ -n "$DIB_LOCAL_ELEMENTS" ]; then
export DIB_LOCAL_ELEMENTS=$DIB_LOCAL_ELEMENTS


+ 0
- 1
zuul.d/jobs.yaml View File

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


Loading…
Cancel
Save