Support various tenant network types
Currently CCP supports only VxLAN network segmentation type. This change adds a new config parameter `tenant_network_types` that allows to specify different allowed network types like `vlan`, `vxlan` or several of them at once, with `vxlan` as the default one. Change-Id: Idcea3f6047c9b06f5fd025de3d38d4dd6153d31c
This commit is contained in:
parent
ee23083cab
commit
e6f78fe6aa
|
@ -8,6 +8,9 @@ configs:
|
|||
cont: 9696
|
||||
ingress: network
|
||||
core_plugin: "ml2"
|
||||
ml2:
|
||||
tenant_network_types:
|
||||
- "vxlan"
|
||||
physnets:
|
||||
- name: "physnet1"
|
||||
bridge_name: "br-ex"
|
||||
|
|
|
@ -6,7 +6,7 @@ type_drivers = local, flat
|
|||
tenant_network_types = local
|
||||
{% else %}
|
||||
type_drivers = flat,vlan,vxlan
|
||||
tenant_network_types = vxlan
|
||||
tenant_network_types = {{ neutron.ml2.tenant_network_types|join(',') }}
|
||||
{% endif %}
|
||||
|
||||
{% if neutron.plugin_agent == "openvswitch" %}
|
||||
|
|
|
@ -37,7 +37,7 @@ service:
|
|||
type: single
|
||||
dependencies:
|
||||
- neutron-server
|
||||
command: neutron --os-endpoint-type internal net-create --provider:network_type vxlan --provider:segmentation_id 77 {{ int.net_name }}
|
||||
command: neutron --os-endpoint-type internal net-create {{ int.net_name }}
|
||||
# {% endif %}
|
||||
- name: neutron-bootstrap-int-net-subnetpool-create
|
||||
type: single
|
||||
|
|
Loading…
Reference in New Issue