Revert ml2 changes
This commit is contained in:
parent
679e1586cf
commit
f9ff037d9d
@ -35,8 +35,6 @@ QUANTUM_NVP_PLUGIN = \
|
||||
"quantum.plugins.nicira.nicira_nvp_plugin.QuantumPlugin.NvpPluginV2"
|
||||
NEUTRON_OVS_PLUGIN = \
|
||||
"neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2"
|
||||
NEUTRON_ML2_PLUGIN = \
|
||||
"neutron.plugins.ml2.plugin.Ml2Plugin"
|
||||
NEUTRON_NVP_PLUGIN = \
|
||||
"neutron.plugins.nicira.nicira_nvp_plugin.NeutronPlugin.NvpPluginV2"
|
||||
NEUTRON = 'neutron'
|
||||
@ -66,11 +64,7 @@ CORE_PLUGIN = {
|
||||
|
||||
|
||||
def core_plugin():
|
||||
if (get_os_codename_install_source(config('openstack-origin')) >= 'icehouse'
|
||||
and config('plugin') == OVS):
|
||||
return NEUTRON_ML2_PLUGIN
|
||||
else:
|
||||
return CORE_PLUGIN[networking_name()][config('plugin')]
|
||||
return CORE_PLUGIN[networking_name()][config('plugin')]
|
||||
|
||||
|
||||
class NetworkServiceContext(OSContextGenerator):
|
||||
|
@ -53,8 +53,6 @@ QUANTUM_PLUGIN_CONF = {
|
||||
|
||||
NEUTRON_OVS_PLUGIN_CONF = \
|
||||
"/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini"
|
||||
NEUTRON_ML2_PLUGIN_CONF = \
|
||||
"/etc/neutron/plugins/ml2/ml2_conf.ini"
|
||||
NEUTRON_NVP_PLUGIN_CONF = \
|
||||
"/etc/neutron/plugins/nicira/nvp.ini"
|
||||
NEUTRON_PLUGIN_CONF = {
|
||||
@ -211,8 +209,7 @@ QUANTUM_OVS_CONFIG_FILES.update(QUANTUM_SHARED_CONFIG_FILES)
|
||||
NEUTRON_OVS_CONFIG_FILES = {
|
||||
NEUTRON_CONF: {
|
||||
'hook_contexts': [context.AMQPContext(),
|
||||
QuantumGatewayContext(),
|
||||
QuantumSharedDBContext()],
|
||||
QuantumGatewayContext()],
|
||||
'services': ['neutron-l3-agent',
|
||||
'neutron-dhcp-agent',
|
||||
'neutron-metadata-agent',
|
||||
@ -229,10 +226,6 @@ NEUTRON_OVS_CONFIG_FILES = {
|
||||
QuantumGatewayContext()],
|
||||
'services': ['neutron-plugin-openvswitch-agent']
|
||||
},
|
||||
NEUTRON_ML2_PLUGIN_CONF: {
|
||||
'hook_contexts': [QuantumGatewayContext()],
|
||||
'services': ['neutron-plugin-openvswitch-agent']
|
||||
},
|
||||
EXT_PORT_CONF: {
|
||||
'hook_contexts': [ExternalPortContext()],
|
||||
'services': []
|
||||
@ -276,12 +269,6 @@ def register_configs():
|
||||
|
||||
plugin = config('plugin')
|
||||
name = networking_name()
|
||||
if plugin == 'ovs':
|
||||
if release >= 'icehouse':
|
||||
CONFIG_FILES[name][plugin].pop(NEUTRON_OVS_PLUGIN_CONF)
|
||||
else:
|
||||
CONFIG_FILES[name][plugin].pop(NEUTRON_ML2_PLUGIN_CONF)
|
||||
|
||||
for conf in CONFIG_FILES[name][plugin]:
|
||||
configs.register(conf,
|
||||
CONFIG_FILES[name][plugin][conf]['hook_contexts'])
|
||||
@ -308,9 +295,8 @@ def restart_map():
|
||||
that should be restarted when file changes.
|
||||
'''
|
||||
_map = {}
|
||||
plugin = config('plugin')
|
||||
name = networking_name()
|
||||
for f, ctxt in CONFIG_FILES[name][plugin].iteritems():
|
||||
for f, ctxt in CONFIG_FILES[name][config('plugin')].iteritems():
|
||||
svcs = []
|
||||
for svc in ctxt['services']:
|
||||
svcs.append(svc)
|
||||
|
@ -1,61 +0,0 @@
|
||||
[ml2]
|
||||
# (ListOpt) List of network type driver entrypoints to be loaded from
|
||||
# the neutron.ml2.type_drivers namespace.
|
||||
#
|
||||
# type_drivers = local,flat,vlan,gre,vxlan
|
||||
# Example: type_drivers = flat,vlan,gre,vxlan
|
||||
type_drivers = gre
|
||||
|
||||
# (ListOpt) Ordered list of network_types to allocate as tenant
|
||||
# networks. The default value 'local' is useful for single-box testing
|
||||
# but provides no connectivity between hosts.
|
||||
#
|
||||
# tenant_network_types = local
|
||||
# Example: tenant_network_types = vlan,gre,vxlan
|
||||
tenant_network_types = gre
|
||||
|
||||
# (ListOpt) Ordered list of networking mechanism driver entrypoints
|
||||
# to be loaded from the neutron.ml2.mechanism_drivers namespace.
|
||||
# mechanism_drivers =
|
||||
# Example: mechanism_drivers = arista
|
||||
# Example: mechanism_drivers = cisco,logger
|
||||
mechanism_drivers = openvswitch
|
||||
|
||||
[ml2_type_flat]
|
||||
# (ListOpt) List of physical_network names with which flat networks
|
||||
# can be created. Use * to allow flat networks with arbitrary
|
||||
# physical_network names.
|
||||
#
|
||||
# flat_networks =
|
||||
# Example:flat_networks = physnet1,physnet2
|
||||
# Example:flat_networks = *
|
||||
|
||||
[ml2_type_vlan]
|
||||
# (ListOpt) List of <physical_network>[:<vlan_min>:<vlan_max>] tuples
|
||||
# specifying physical_network names usable for VLAN provider and
|
||||
# tenant networks, as well as ranges of VLAN tags on each
|
||||
# physical_network available for allocation as tenant networks.
|
||||
#
|
||||
# network_vlan_ranges =
|
||||
# Example: network_vlan_ranges = physnet1:1000:2999,physnet2
|
||||
|
||||
[ml2_type_gre]
|
||||
# (ListOpt) Comma-separated list of <tun_min>:<tun_max> tuples enumerating ranges of GRE tunnel IDs that are available for tenant network allocation
|
||||
# tunnel_id_ranges =
|
||||
tunnel_id_ranges = 1:1000
|
||||
|
||||
[ml2_type_vxlan]
|
||||
# (ListOpt) Comma-separated list of <vni_min>:<vni_max> tuples enumerating
|
||||
# ranges of VXLAN VNI IDs that are available for tenant network allocation.
|
||||
#
|
||||
# vni_ranges =
|
||||
|
||||
# (StrOpt) Multicast group for the VXLAN interface. When configured, will
|
||||
# enable sending all broadcast traffic to this multicast group. When left
|
||||
# unconfigured, will disable multicast VXLAN mode.
|
||||
#
|
||||
# vxlan_group =
|
||||
# Example: vxlan_group = 239.1.1.1
|
||||
|
||||
[ovs]
|
||||
local_ip = {{ local_ip }}
|
Loading…
x
Reference in New Issue
Block a user