From 951f018efe87cc62a6f26605ad291faf7f4e1b93 Mon Sep 17 00:00:00 2001 From: Michael Johnson Date: Mon, 24 Sep 2018 16:33:21 -0700 Subject: [PATCH] Pass through DIB_LOCAL_ELEMENTS from localrc This patch allows us to specify special DIB elements via the localrc. An octavia-tempest-plugin patch[1] linked to this will use this setting in the gates to configure DIB to use the infra package mirrors. [1] https://review.openstack.org/#/c/601332 Change-Id: I7444e8941c7175d92c50f1714a87b4181b983829 --- devstack/plugin.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 2706a4d65a..1aba18fac6 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -49,6 +49,11 @@ 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 + fi + # pull the agent code from the current code zuul has a reference to if [ -n "$DIB_REPOLOCATION_pip_and_virtualenv" ]; then export DIB_REPOLOCATION_pip_and_virtualenv=$DIB_REPOLOCATION_pip_and_virtualenv