openstack/instack-undercloud
Code Issues Proposed changes

Add router for IPv6 ctlplane subnet

Browse Source 
A router is needed so that router advertisements are send out for
the subnet. Also add the router plugin and start the l3 agent
which are responsible for the router handling.

Change-Id: I477e370b701cb56c21395310199d7ac5dab82b78
This commit is contained in:
Derek Higgins 2017-08-22 13:55:00 +01:00
parent f1628c3976
commit c2aa2ad244
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
elements/puppet-stack-config/puppet-stack-config.pp
View File

@ -410,6 +410,9 @@ class { '::neutron::agents::dhcp':
dnsmasq_config_file => '/etc/dnsmasq-ironic.conf', dnsmasq_config_file => '/etc/dnsmasq-ironic.conf',
} }
class { '::neutron::agents::l3':
}
class { '::neutron::agents::ml2::ovs': class { '::neutron::agents::ml2::ovs':
bridge_mappings => split(hiera('neutron_bridge_mappings'), ','), bridge_mappings => split(hiera('neutron_bridge_mappings'), ','),
} }

1
elements/puppet-stack-config/puppet-stack-config.yaml.template
View File

@ -237,6 +237,7 @@ mysql::server::restart: true
neutron::debug: "%{hiera('debug')}" neutron::debug: "%{hiera('debug')}"
neutron::bind_host: {{LOCAL_IP}} neutron::bind_host: {{LOCAL_IP}}
neutron::core_plugin: ml2 neutron::core_plugin: ml2
neutron::service_plugins: ['router']
neutron::dhcp_agents_per_network: 2 neutron::dhcp_agents_per_network: 2
neutron::dns_domain: {{OVERCLOUD_DOMAIN_NAME}} neutron::dns_domain: {{OVERCLOUD_DOMAIN_NAME}}
neutron::server::api_workers: "%{::os_workers}" neutron::server::api_workers: "%{::os_workers}"

13
elements/undercloud-install/os-refresh-config/post-configure.d/98-undercloud-setup
View File

@ -70,7 +70,11 @@ if [ -n "$subnet_id" ]; then
fi fi
if [ "$net_create" -eq "1" ]; then if [ "$net_create" -eq "1" ]; then
# Delete the subnet and network to make sure it doesn't already exist # Delete the route, subnet and network to make sure it doesn't already exist
if neutron router-show ctlplane-router ; then
neutron router-interface-delete ctlplane-router ctlplane-subnet
neutron router-delete ctlplane-router
fi
if neutron subnet-list | grep start; then if neutron subnet-list | grep start; then
neutron subnet-delete $(neutron subnet-list | grep start | awk '{print $2}') neutron subnet-delete $(neutron subnet-list | grep start | awk '{print $2}')
fi fi
@ -87,6 +91,13 @@ if [ "$net_create" -eq "1" ]; then
--gateway $NETWORK_GATEWAY \ --gateway $NETWORK_GATEWAY \
$SUBNET_VERSION_STRING $SUBNET_ROUTE_STRING \ $SUBNET_VERSION_STRING $SUBNET_ROUTE_STRING \
ctlplane $NETWORK_CIDR ctlplane $NETWORK_CIDR
# If ctlplane-subnet is IPv6 we need to start a router so the router advertisments are sent out
# for statless IP addressing to work.
if [[ $DHCP_START =~ : ]] ; then
neutron router-create ctlplane-router
neutron router-interface-add ctlplane-router ctlplane-subnet
fi
fi fi
# Disable nova quotas # Disable nova quotas