newton: legacy external networking support

For OpenStack Newton, the external network bridge configuration
default switched from br-ex to '' inline with the preferred
method of configuring external networks using provider networks
via the l2 agent (instead of the l3 agent).

This had the side effect of breaking support for legacy style
networking.

Set:

  external_network_bridge = br-ex

in the event that new style external networking is not being used
to preserve backwards compatibility for now.

Note that this option will be removed in Ocata, so environments
need to upgrade to the preferred method of external networking in
order to stay supported.

Change-Id: Id929c0fa9baa0ecf0168d4d08f93939b56f847ab
Closes-Bug: 1634966
This commit is contained in:
James Page 2016-11-21 17:50:21 +00:00
parent 52994e3782
commit 2a89032bbd
1 changed files with 32 additions and 0 deletions

View File

@ -0,0 +1,32 @@
# newton
###############################################################################
# [ WARNING ]
# Configuration file maintained by Juju. Local changes may be overwritten.
###############################################################################
[DEFAULT]
interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
auth_url = {{ service_protocol }}://{{ keystone_host }}:{{ service_port }}/v2.0
auth_region = {{ region }}
admin_tenant_name = {{ service_tenant }}
admin_user = {{ service_username }}
admin_password = {{ service_password }}
root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
handle_internal_only_routers = {{ handle_internal_only_router }}
{% if plugin == 'n1kv' %}
l3_agent_manager = neutron.agent.l3_agent.L3NATAgentWithStateReport
external_network_bridge = br-int
ovs_use_veth = False
use_namespaces = True
{% else %}
ovs_use_veth = True
{% endif %}
{% if external_configuration_new -%}
gateway_external_network_id =
external_network_bridge =
{% elif ext_net_id %}
gateway_external_network_id = {{ ext_net_id }}
{% else %}
# Set default to deprecated external networking config
external_network_bridge = br-ex
{% endif -%}
agent_mode = {{ agent_mode }}