summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-10-07 10:50:06 +0000
committerGerrit Code Review <review@openstack.org>2019-10-07 10:50:06 +0000
commitac7f92ad57768648f007330f0011698f76d9aea6 (patch)
tree3e893fbe663d7378ac1b1f1260f7aa05cfaea79a
parentb130e0f200533497510eb7617cdd0a31047ef7db (diff)
parentd1abf8a69297f6497c30f1622d762c3323b10277 (diff)
downloadironic-ac7f92ad57768648f007330f0011698f76d9aea6.tar.gz
Merge "Fix devstack installation failure" into stable/train
-rw-r--r--devstack/lib/ironic2
1 files changed, 1 insertions, 1 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic
index e2938ac10..3bf287411 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" \