summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Dearborn <Christopher.Dearborn@dell.com>2019-10-01 19:22:31 -0400
committerDmitry Tantsur <dtantsur@protonmail.com>2019-10-05 13:04:35 +0000
commitd1abf8a69297f6497c30f1622d762c3323b10277 (patch)
treee09501cc636c4069cebdefb24c5182519cc8b130
parentc9a380afe0a0158b4ff92521c547bc59812c3c25 (diff)
downloadironic-d1abf8a69297f6497c30f1622d762c3323b10277.tar.gz
Fix devstack installation failure
This patch fixes an exception that occurs when deploying devstack with the DIB ramdisk. Change-Id: Ia4499291b6dff1e8c8b6cd1ac544a1e3787ccf83 Story: #2006645 Task: #36881 (cherry picked from commit dab47f9ce143fa1d7fb7c51608bb69332464d914)
-rw-r--r--devstack/lib/ironic2
1 files changed, 1 insertions, 1 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic
index f91353fd9..b35bf93f7 100644
--- a/devstack/lib/ironic
+++ b/devstack/lib/ironic
@@ -2518,7 +2518,7 @@ function build_ipa_dib_ramdisk {
if is_deploy_iso_required; then
IRONIC_DIB_RAMDISK_OPTIONS+=" iso"
fi
- git_clone $IRONIC_PYTHON_AGENT_BUILDER_REPO $IRONIC_PYTHON_AGENT_BUILDER_DIR
+ git_clone $IRONIC_PYTHON_AGENT_BUILDER_REPO $IRONIC_PYTHON_AGENT_BUILDER_DIR $IRONIC_PYTHON_AGENT_BUILDER_BRANCH
ELEMENTS_PATH="$IRONIC_PYTHON_AGENT_BUILDER_DIR/dib" \
disk-image-create "$IRONIC_DIB_RAMDISK_OPTIONS" \
-o "$tempdir/ironic-agent" \