Merge "devstack - enable v6 addr list if q-dhcp enabled"
This commit is contained in:
commit
feb7740009
@ -1447,6 +1447,7 @@ function configure_ironic_inspection_network {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function configure_ironic_provision_network {
|
function configure_ironic_provision_network {
|
||||||
|
configure_neutron_dhcp_enable_addr6_list
|
||||||
if [[ "$IRONIC_IP_VERSION" == "6" ]]; then
|
if [[ "$IRONIC_IP_VERSION" == "6" ]]; then
|
||||||
# NOTE(TheJulia): Ideally we should let this happen
|
# NOTE(TheJulia): Ideally we should let this happen
|
||||||
# with our global address, but iPXE seems to have in
|
# with our global address, but iPXE seems to have in
|
||||||
@ -1576,6 +1577,13 @@ function configure_neutron_l3_lower_v6_ra {
|
|||||||
iniset $Q_L3_CONF_FILE DEFAULT min_rtr_adv_interval 5
|
iniset $Q_L3_CONF_FILE DEFAULT min_rtr_adv_interval 5
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function configure_neutron_dhcp_enable_addr6_list {
|
||||||
|
if is_service_enabled q-dhcp; then
|
||||||
|
iniset $Q_DHCP_CONF_FILE DEFAULT dnsmasq_enable_addr6_list true
|
||||||
|
restart_service devstack@q-dhcp.service
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
# configure_ironic() - Set config files, create data dirs, etc
|
# configure_ironic() - Set config files, create data dirs, etc
|
||||||
function configure_ironic {
|
function configure_ironic {
|
||||||
configure_ironic_dirs
|
configure_ironic_dirs
|
||||||
|
Loading…
Reference in New Issue
Block a user