diff options
| author | Zuul <zuul@review.opendev.org> | 2022-05-05 14:46:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-05-05 14:46:27 +0000 |
| commit | 49113385e89c52b56152418d3a0c8c69ddaf8b6e (patch) | |
| tree | c9eb87c1bb0033e8b246c4d208f861f79f836cfb /devstack/lib/ironic | |
| parent | 9e6afcdc6891769b10164823e3ec7f88c6493465 (diff) | |
| parent | a9f4acfdb099a8c24e35c6329913db10cc3ac150 (diff) | |
| download | ironic-49113385e89c52b56152418d3a0c8c69ddaf8b6e.tar.gz | |
Merge "Fix v6 CI job - Return it to normal non-voting status"
Diffstat (limited to 'devstack/lib/ironic')
| -rw-r--r-- | devstack/lib/ironic | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic index ef1081752..7e5e01fc6 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -500,7 +500,7 @@ else # loopback cannot be used for v6 testing. IRONIC_HOST_IPV6='fc00::1' else - IRONIC_HOST_IPV6=$SERVICE_HOST + IRONIC_HOST_IPV6=$HOST_IPV6 fi IRONIC_PROVISION_SUBNET_GATEWAY=${IRONIC_PROVISION_SUBNET_GATEWAY:-'fc01::1'} IRONIC_PROVISION_SUBNET_SUBNODE_IP=${IRONIC_PROVISION_SUBNET_SUBNODE_IP:-'fc01::2'} @@ -1342,7 +1342,7 @@ function configure_ironic_rescue_network { } function configure_ironic_provision_network { - if [[ "$IP_VERSION" == "6" ]]; then + if [[ "$IRONIC_IP_VERSION" == "6" ]]; then # NOTE(TheJulia): Ideally we should let this happen # with our global address, but iPXE seems to have in # consistant behavior in this configuration with devstack. @@ -1402,9 +1402,11 @@ function configure_ironic_provision_network { --gateway $IRONIC_PROVISION_SUBNET_GATEWAY --network $net_id \ --subnet-range $IRONIC_PROVISION_SUBNET_PREFIX -f value -c id)" else + # NOTE(TheJulia): Consider changing this to stateful to support UEFI once we move + # CI to Ubuntu Jammy as it will support v6 and v4 UEFI firmware driven boot ops. subnet_id="$(openstack --os-cloud $OS_CLOUD subnet create --ip-version 6 \ - --ipv6-address-mode dhcpv6-stateful \ - --ipv6-ra-mode dhcpv6-stateful \ + --ipv6-address-mode dhcpv6-stateless \ + --ipv6-ra-mode dhcpv6-stateless \ --dns-nameserver 2001:4860:4860::8888 \ ${net_segment_id:+--network-segment $net_segment_id} \ $IRONIC_PROVISION_PROVIDER_SUBNET_NAME \ |