summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2022-07-25 17:07:51 +0000
committerGerrit Code Review <review@openstack.org>2022-07-25 17:07:51 +0000
commit4d5c60650efb3fd3af3179d34d2684617a7780ee (patch)
tree97b2e398ac390efa1d3f1370d99d03f3c0fd632e
parente98d51502ebd56aa1127f8ca01b93f6e3d1ba9a8 (diff)
parentf7471f07c3fc735696dc0291e6a187785d411e0c (diff)
downloadironic-4d5c60650efb3fd3af3179d34d2684617a7780ee.tar.gz
Merge "CI: Only setup fake v6 interface if needed"
-rw-r--r--devstack/lib/ironic10
1 files changed, 7 insertions, 3 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic
index 8c333d4e9..90842cfaf 100644
--- a/devstack/lib/ironic
+++ b/devstack/lib/ironic
@@ -1354,9 +1354,13 @@ function configure_ironic_provision_network {
# with our global address, but iPXE seems to have in
# consistant behavior in this configuration with devstack.
# so we will setup a dummy interface and use that.
- sudo ip link add magicv6 type dummy
- sudo ip link set dev magicv6 up
- sudo ip -6 addr add $IRONIC_HOST_IPV6/64 dev magicv6
+ if ! $( ping -c1 -w1 $IRONIC_HOST_IPV6 ); then
+ # But before we create an interface, lets make sure it is
+ # not already working.
+ sudo ip link add magicv6 type dummy
+ sudo ip link set dev magicv6 up
+ sudo ip -6 addr add $IRONIC_HOST_IPV6/64 dev magicv6
+ fi
fi
if is_service_enabled neutron-api; then
if [[ "$IRONIC_IP_VERSION" == "6" ]]; then