x
/
packstack
Code Issues Proposed changes

Remove parameters deprecated by puppet-neutron 

[1] removed some deprecated parameters in puppet-neutron. Some of
them are still being used by Packstack, so let's remove them.

[1] - https://review.openstack.org/575976

Change-Id: I4b4beac2f4061689056c399e05d9dd5c6689e82f
This commit is contained in:
Javier Pena 2018-06-25 14:53:13 +02:00
parent 53ada40f90
commit bb28296d5e
6 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/packstack.rst
View File

@ -820,9 +820,6 @@ Neutron ML2 plugin config
**CONFIG_NEUTRON_ML2_VXLAN_GROUP**
Comma-separated list of addresses for VXLAN multicast group. If left empty, disables VXLAN from sending allocate broadcast traffic (disables multicast VXLAN mode). Should be a Multicast IP (v4 or v6) address.
**CONFIG_NEUTRON_ML2_SUPPORTED_PCI_VENDOR_DEVS**
Comma separated list of supported PCI vendor devices defined by vendor_id:product_id according to the PCI ID Repository.
**CONFIG_NEUTRON_ML2_VNI_RANGES**
Comma-separated list of <vni_min>:<vni_max> tuples enumerating ranges of VXLAN VNI IDs that are available for tenant network allocation. Minimum value is 0 and maximum value is 16777215.

16
packstack/plugins/neutron_350.py
View File

@ -461,20 +461,6 @@ def initConfig(controller):
"Geneve will be used as encapsulation method for tenant networks"),
"MESSAGE_VALUES": ["ovn"]},
{"CMD_OPTION": "os-neutron-ml2-supported-pci-vendor-devs",
"CONF_NAME": "CONFIG_NEUTRON_ML2_SUPPORTED_PCI_VENDOR_DEVS",
"PROMPT": ("Enter a comma separated list of supported PCI "
"vendor devices, defined by vendor_id:product_id "
"according to the PCI ID Repository."),
"OPTION_LIST": [],
"VALIDATORS": [],
"DEFAULT_VALUE": ['15b3:1004', '8086:10ca'],
"MASK_INPUT": False,
"LOOSE_VALIDATION": False,
"USE_DEFAULT": False,
"NEED_CONFIRM": False,
"CONDITION": False},
{"CMD_OPTION": "os-neutron-ml2-sriov-interface-mappings",
"PROMPT": ("Enter a comma separated list of interface mappings "
"for the Neutron ML2 sriov agent"),
@ -968,8 +954,6 @@ def create_l2_agent_manifests(config, messages):
if agent in ["openvswitch", "ovn"]:
ovs_type = 'CONFIG_NEUTRON_ML2_TYPE_DRIVERS'
ovs_type = config.get(ovs_type, 'local')
tunnel = use_openvswitch_vxlan(config) or use_openvswitch_gre(config)
config["CONFIG_NEUTRON_OVS_TUNNELING"] = tunnel
tunnel_types = set(ovs_type) & set(['gre', 'vxlan'])
config["CONFIG_NEUTRON_OVS_TUNNEL_TYPES"] = list(tunnel_types)

1
packstack/puppet/modules/packstack/manifests/neutron/ml2.pp
View File

@ -17,7 +17,6 @@ class packstack::neutron::ml2 ()
vni_ranges => hiera_array('CONFIG_NEUTRON_ML2_VNI_RANGES'),
enable_security_group => true,
firewall_driver => hiera('FIREWALL_DRIVER'),
supported_pci_vendor_devs => hiera_array('CONFIG_NEUTRON_ML2_SUPPORTED_PCI_VENDOR_DEVS'),
extension_drivers => 'port_security,qos',
max_header_size => 38,
}

1
packstack/puppet/modules/packstack/manifests/neutron/ovs_agent.pp
View File

@ -45,7 +45,6 @@ class packstack::neutron::ovs_agent ()
class { '::neutron::agents::ml2::ovs':
bridge_uplinks => $bridge_uplinks,
bridge_mappings => $bridge_mappings,
enable_tunneling => hiera('CONFIG_NEUTRON_OVS_TUNNELING'),
tunnel_types => hiera_array('CONFIG_NEUTRON_OVS_TUNNEL_TYPES'),
local_ip => force_ip($localip),
vxlan_udp_port => hiera('CONFIG_NEUTRON_OVS_VXLAN_UDP_PORT',undef),

1
packstack/puppet/modules/packstack/manifests/neutron/vpnaas.pp
View File

@ -1,7 +1,6 @@
class packstack::neutron::vpnaas ()
{
class { '::neutron::agents::vpnaas':
enabled => true,
vpn_device_driver => 'neutron_vpnaas.services.vpn.device_drivers.libreswan_ipsec.LibreSwanDriver',
}
}

6
releasenotes/notes/Remove-CONFIG_NEUTRON_ML2_SUPPORTED_PCI_VENDOR_DEVS-param-926649e4eef08b44.yaml Normal file
View File

@ -0,0 +1,6 @@
---
deprecations:
- |
The CONFIG_NEUTRON_ML2_SUPPORTED_PCI_VENDOR_DEVS is no longer needed in
the answers file. The upstream parameter was already removed, and all
PCI device ids are supported by Nova and Neutron.