From 3e3a69774c885698c7bb01835e01d5a847770789 Mon Sep 17 00:00:00 2001
From: Michael Johnson <johnsomor@gmail.com>
Date: Thu, 5 Sep 2019 14:14:47 +0000
Subject: [PATCH] Revert "Use the infra pypi mirror for DIB"

diskimage-builder is broken in the version in stable/rocky upperconstraints.txt.

This reverts commit 7486abcc34c04f1846eca27bf180f36b408f471f.

Change-Id: I001068059b02c909e3b7b105f2f168e5bfed8291
---
 devstack/plugin.sh | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index c6c30f4561..ab029291f3 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -74,22 +74,6 @@ function build_octavia_worker_image {
     if [[ ${OCTAVIA_AMP_IMAGE_SIZE:+1} ]] ; then
     export PARAM_OCTAVIA_AMP_IMAGE_SIZE='-s '$OCTAVIA_AMP_IMAGE_SIZE
     fi
-
-    # Use the infra pypi mirror if it is available
-    if [[ -e /etc/ci/mirror_info.sh ]]; then
-        source /etc/ci/mirror_info.sh
-    fi
-    if [[ ${NODEPOOL_PYPI_MIRROR:+1} ]]; then
-        if [[ ${DIB_LOCAL_ELEMENTS:+1} ]]; then
-            export DIB_LOCAL_ELEMENTS="${DIB_LOCAL_ELEMENTS} pypi"
-        else
-            export DIB_LOCAL_ELEMENTS='pypi'
-        fi
-        export DIB_PYPI_MIRROR_URL=$NODEPOOL_PYPI_MIRROR
-        export DIB_PYPI_MIRROR_URL_1=$NODEPOOL_WHEEL_MIRROR
-        export DIB_PIP_RETRIES=0
-    fi
-
     if ! [ -f $OCTAVIA_AMP_IMAGE_FILE ]; then
         $OCTAVIA_DIR/diskimage-create/diskimage-create.sh $octavia_dib_tracing_arg -o $OCTAVIA_AMP_IMAGE_FILE ${PARAM_OCTAVIA_AMP_BASE_OS:-} ${PARAM_OCTAVIA_AMP_DISTRIBUTION_RELEASE_ID:-} ${PARAM_OCTAVIA_AMP_IMAGE_SIZE:-}
     fi