openstack/kayobe
Code Issues Proposed changes

Allow configuration of neutron extension drivers

Browse Source
This commit is contained in:
Mark Goddard 2017-05-19 14:17:59 +01:00
parent 149a765f89
commit 17165c4da7
4 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ansible/group_vars/all/neutron
View File

@ -25,6 +25,12 @@ kolla_neutron_ml2_tenant_network_types:
# range: Range of allowed VLANs on this physical network (min:max, (optional) # range: Range of allowed VLANs on this physical network (min:max, (optional)
kolla_neutron_ml2_network_vlan_ranges: [] kolla_neutron_ml2_network_vlan_ranges: []
# List of Neutron ML2 extention drivers to use.
kolla_neutron_ml2_extension_drivers: []
###############################################################################
# Neutron ML2 generic switch driver configuration.
# List of switches to configure for use by genericswitch ML2 mechanism driver. # List of switches to configure for use by genericswitch ML2 mechanism driver.
# Each item should be a dict containing the following items: # Each item should be a dict containing the following items:
# name: Hostname of the switch # name: Hostname of the switch

3
ansible/roles/kolla-openstack/defaults/main.yml
View File

@ -189,6 +189,9 @@ kolla_neutron_ml2_tenant_network_types: []
# range: Range of allowed VLANs on this physical network (min:max, (optional) # range: Range of allowed VLANs on this physical network (min:max, (optional)
kolla_neutron_ml2_network_vlan_ranges: [] kolla_neutron_ml2_network_vlan_ranges: []
# List of Neutron ML2 extention drivers to use.
kolla_neutron_ml2_extension_drivers: []
# List of switches to configure for use by genericswitch ML2 mechanism driver. # List of switches to configure for use by genericswitch ML2 mechanism driver.
# Each item should be a dict containing the following items; # Each item should be a dict containing the following items;
# name: Hostname of the switch # name: Hostname of the switch

4
ansible/roles/kolla-openstack/templates/ml2_conf.ini.j2
View File

@ -13,6 +13,10 @@ type_drivers = {{ kolla_neutron_ml2_type_drivers | join(',') }}
tenant_network_types = {{ kolla_neutron_ml2_tenant_network_types | join(',') }} tenant_network_types = {{ kolla_neutron_ml2_tenant_network_types | join(',') }}
{% endif %} {% endif %}
{% if kolla_neutron_ml2_extension_drivers %}
extension_drivers = {{ kolla_neutron_ml2_extension_drivers | join(',') }}
{% endif %}
[ml2_type_vlan] [ml2_type_vlan]
{% if kolla_neutron_ml2_network_vlan_ranges %} {% if kolla_neutron_ml2_network_vlan_ranges %}
network_vlan_ranges = {% for vnr in kolla_neutron_ml2_network_vlan_ranges %}{{ vnr.physical_network }}{% if vnr.range is defined %}:{{ vnr.range }}{% endif %}{% if not loop.last %},{% endif %}{% endfor %} network_vlan_ranges = {% for vnr in kolla_neutron_ml2_network_vlan_ranges %}{{ vnr.physical_network }}{% if vnr.range is defined %}:{{ vnr.range }}{% endif %}{% if not loop.last %},{% endif %}{% endfor %}

3
etc/kayobe/neutron.yml
View File

@ -18,6 +18,9 @@
# max: Maximum of allowed VLAN range (optional) # max: Maximum of allowed VLAN range (optional)
#kolla_neutron_ml2_network_vlan_ranges: #kolla_neutron_ml2_network_vlan_ranges:
# List of Neutron ML2 extention drivers to use.
#kolla_neutron_ml2_extension_drivers:
# List of switches to configure for use by genericswitch ML2 mechanism driver. # List of switches to configure for use by genericswitch ML2 mechanism driver.
# Each item should be a dict containing the following items: # Each item should be a dict containing the following items:
# name: Hostname of the switch # name: Hostname of the switch