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

devstack/plugin.sh

@@ -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

zuul.d/jobs.yaml

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