openstack/devstack
Code Issues Proposed changes

Merge "Enable accept_ra before enabling forwarding"

Browse Source
This commit is contained in:
Zuul 2019-09-24 22:41:48 +00:00 committed by Gerrit Code Review
commit e3cd502252
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/neutron_plugins/services/l3
View File

@ -395,8 +395,6 @@ function _neutron_configure_router_v6 {
# This logic is specific to using the l3-agent for layer 3 # This logic is specific to using the l3-agent for layer 3
if is_service_enabled q-l3 || is_service_enabled neutron-l3; then if is_service_enabled q-l3 || is_service_enabled neutron-l3; then
# Ensure IPv6 forwarding is enabled on the host
sudo sysctl -w net.ipv6.conf.all.forwarding=1
# if the Linux host considers itself to be a router then it will # if the Linux host considers itself to be a router then it will
# ignore all router advertisements # ignore all router advertisements
# Ensure IPv6 RAs are accepted on interfaces with a default route. # Ensure IPv6 RAs are accepted on interfaces with a default route.
@ -409,6 +407,8 @@ function _neutron_configure_router_v6 {
# device name would be reinterpreted as a slash, causing an error. # device name would be reinterpreted as a slash, causing an error.
sudo sysctl -w net/ipv6/conf/$d/accept_ra=2 sudo sysctl -w net/ipv6/conf/$d/accept_ra=2
done done
# Ensure IPv6 forwarding is enabled on the host
sudo sysctl -w net.ipv6.conf.all.forwarding=1
# Configure and enable public bridge # Configure and enable public bridge
# Override global IPV6_ROUTER_GW_IP with the true value from neutron # Override global IPV6_ROUTER_GW_IP with the true value from neutron
IPV6_ROUTER_GW_IP=$(openstack --os-cloud devstack-admin --os-region "$REGION_NAME" port list -c 'Fixed IP Addresses' | grep $ipv6_pub_subnet_id | awk -F'ip_address' '{ print $2 }' | cut -f2 -d\' | tr '\n' ' ') IPV6_ROUTER_GW_IP=$(openstack --os-cloud devstack-admin --os-region "$REGION_NAME" port list -c 'Fixed IP Addresses' | grep $ipv6_pub_subnet_id | awk -F'ip_address' '{ print $2 }' | cut -f2 -d\' | tr '\n' ' ')