Clean up deprecated support for networking-cisco
... which was deprecated by [1] in a past release.
[1] a8d14466a6
Change-Id: I88f639219aa95f566ea1b7054bf2cbc339e93b93
This commit is contained in:
Takashi Kajinami
parent
3d03306ae4
commit
a6c4ba2c2b
@ -1,20 +0,0 @@
|
||||
#
|
||||
# DEPRECATED !
|
||||
# Install the Cisco plugins and generate the config file
|
||||
# from parameters in the other classes.
|
||||
#
|
||||
# === Parameters
|
||||
#
|
||||
# [*package_ensure*]
|
||||
# (optional) The intended state of the neutron-plugin-cisco
|
||||
# package, i.e. any of the possible values of the 'ensure'
|
||||
# property for a package resource type.
|
||||
# Defaults to 'present'
|
||||
#
|
||||
|
||||
class neutron::plugins::ml2::cisco (
|
||||
$package_ensure = 'present'
|
||||
) {
|
||||
|
||||
warning('Support for networking-cisco has been deprecated and has no effect')
|
||||
}
|
||||
@ -1,75 +0,0 @@
|
||||
# == Class: neutron::plugins::ml2::cisco::nexus
|
||||
#
|
||||
# DEPRECATED !
|
||||
# Configure the Cisco Nexus Mech Driver for neutron ML2 plugin
|
||||
# More info available here:
|
||||
# http://networking-cisco.readthedocs.io
|
||||
#
|
||||
# === Parameters:
|
||||
#
|
||||
# [*nexus_config*]
|
||||
# (required) Nexus switch configuration for neutron configuration file
|
||||
# Example nexus config format:
|
||||
# { 'switch_hostname' => {'username' => 'admin',
|
||||
# 'password' => "password",
|
||||
# 'ip_address' => "172.18.117.28",
|
||||
# 'nve_src_intf' => 1,
|
||||
# 'physnet' => "physnet1",
|
||||
# 'vpc_pool' => "1001-1025,1028",
|
||||
# 'intfcfg_portchannel' => "no lacp suspend-individual;
|
||||
# spanning-tree port type edge trunk",
|
||||
# 'https_verify' => True,
|
||||
# 'https_local_certificate' => '/tmp/my_local_cert.crt',
|
||||
# 'servers' => {
|
||||
# 'control01' => {"ports" => "portchannel:20"},
|
||||
# 'control02' => {"ports" => "portchannel:10"}
|
||||
# }}}
|
||||
#
|
||||
# [*managed_physical_network*]
|
||||
# (required) The name of the physical_network managed via the Cisco
|
||||
# Nexus Switch. This string value must be present in the ml2_conf.ini
|
||||
# network_vlan_ranges variable.
|
||||
#
|
||||
# [*switch_heartbeat_time*]
|
||||
# (optional) Time interval to check the state of the Nexus device.
|
||||
# (default) This value defaults to 30 seconds. To disable, set to 0.
|
||||
# Defaults to 30
|
||||
#
|
||||
# [*provider_vlan_auto_create*]
|
||||
# (optional) A flag indicating whether OpenStack networking should manage the
|
||||
# creation and removal of VLANs for provider networks on the Nexus
|
||||
# switches. If the flag is set to False then OpenStack will not create or
|
||||
# remove VLANs for provider networks, and the administrator needs to
|
||||
# manage these interfaces manually or by external orchestration.
|
||||
# Defaults to true
|
||||
#
|
||||
# [*provider_vlan_auto_trunk*]
|
||||
# (optional) A flag indicating whether OpenStack networking should manage
|
||||
# the adding and removing of provider VLANs from trunk ports on the Nexus
|
||||
# switches. If the flag is set to False then OpenStack will not add or
|
||||
# remove provider VLANs from trunk ports, and the administrator needs to
|
||||
# manage these operations manually or by external orchestration.
|
||||
# Defaults to true
|
||||
#
|
||||
# [*vxlan_global_config*]
|
||||
# (optional) A flag indicating whether OpenStack networking should manage the
|
||||
# creating and removing of the Nexus switch VXLAN global settings of 'feature
|
||||
# nv overlay', 'feature vn-segment-vlan-based', 'interface nve 1' and the NVE
|
||||
# subcommand 'source-interface loopback #'. If the flag is set to False
|
||||
# (default) then OpenStack will not add or remove these VXLAN settings, and
|
||||
# the administrator needs to manage these operations manually or by external
|
||||
# orchestration.
|
||||
# Defaults to true
|
||||
#
|
||||
|
||||
class neutron::plugins::ml2::cisco::nexus (
|
||||
$nexus_config,
|
||||
$managed_physical_network,
|
||||
$switch_heartbeat_time = 30,
|
||||
$provider_vlan_auto_create = true,
|
||||
$provider_vlan_auto_trunk = true,
|
||||
$vxlan_global_config = true
|
||||
) {
|
||||
|
||||
warning('Support for networking-cisco has been deprecated and has no effect')
|
||||
}
|
||||
@ -1,131 +0,0 @@
|
||||
# == Define: neutron::plugins::ml2::cisco::nexus_creds
|
||||
#
|
||||
# Defined type to configure the Cisco Nexus Switch Credentials
|
||||
# for use by the ML2 Mech Driver for Cisco Nexus Switches.
|
||||
#
|
||||
# More info available here:
|
||||
# http://networking-cisco.readthedocs.io
|
||||
#
|
||||
#
|
||||
# neutron::plugins::ml2::cisco::nexus_creds used by
|
||||
# neutron::plugins::ml2::cisco::nexus
|
||||
#
|
||||
# === Parameters:
|
||||
#
|
||||
# [*username*]
|
||||
# (not used) The username for logging into the switch to manage it.
|
||||
#
|
||||
# [*password*]
|
||||
# (not used) The password for logging into the switch to manage it.
|
||||
#
|
||||
# [*servers*]
|
||||
# (not used) A hash of server names (key) mapped to the switch's
|
||||
# interfaces (value). For each host connected to a port on the
|
||||
# switch, specify the hostname and the Nexus physical port/s
|
||||
# (interface/s) it is connected to. The values in the hash can
|
||||
# be a comma separated list of interfaces mapped to the server.
|
||||
#
|
||||
# Hash Format:
|
||||
#
|
||||
# {
|
||||
# <hostname> => "<interfaceID1>,<interfaceID2>,<... interfaceID_N>"
|
||||
# }
|
||||
#
|
||||
# Interface ID format options:
|
||||
# "<intf_type>:<position>"
|
||||
# Valid intf_type's are 'ethernet' and 'port-channel'.
|
||||
# The default setting for <intf_type:> is 'ethernet' and need not be
|
||||
# added to this setting.
|
||||
#
|
||||
# Example:
|
||||
# {
|
||||
# 'control1' => 'ethernet:1/1',
|
||||
# 'control2' => 'ethernet:1/2',
|
||||
# 'compute1' => '1/3,1/4'
|
||||
# }
|
||||
#
|
||||
# [*ip_address*]
|
||||
# (required) The IP address of the switch.
|
||||
#
|
||||
# [*nve_src_intf*]
|
||||
# (not used) Only valid if VXLAN overlay is configured and
|
||||
# vxlan_global_config is set to True.
|
||||
#
|
||||
# The NVE source interface is a loopback interface that is configured on
|
||||
# the switch with valid /32 IP address. This /32 IP address must be known
|
||||
# by the transient devices in the transport network and the remote VTEPs.
|
||||
# This is accomplished by advertising it through a dynamic routing protocol
|
||||
# in the transport network. (NB: If no nve_src_intf is defined then a
|
||||
# default setting of 0 (creates "loopback0") will be used.)
|
||||
#
|
||||
# Defaults to undef.
|
||||
#
|
||||
# [*physnet*]
|
||||
# (not used) Only valid if VXLAN overlay is configured.
|
||||
# The physical network name defined in the network_vlan_ranges variable
|
||||
# (defined under the ml2_type_vlan section) that this switch is controlling.
|
||||
# The configured 'physnet' is the physical network domain that is connected
|
||||
# to this switch. The vlan ranges defined in network_vlan_ranges for a
|
||||
# a physical network are allocated dynamically and are unique per physical
|
||||
# network. These dynamic vlans may be reused across physical networks.
|
||||
#
|
||||
# Defaults to undef.
|
||||
#
|
||||
# [*vpc_pool*]
|
||||
# (not used) Required for Baremetal deployments and Port-Channel creation
|
||||
# is needed. This defines the pool of port-channel ids which are
|
||||
# available for port-channel creation.
|
||||
#
|
||||
# Defaults to undef.
|
||||
#
|
||||
# [*intfcfg_portchannel*]
|
||||
# (not used) For use with Baremetal deployments and custom port-channel
|
||||
# configuration is required during port-channel creation.
|
||||
#
|
||||
# Defaults to undef.
|
||||
#
|
||||
# [*https_verify*]
|
||||
# (not used) Set to True when certification authority (CA) file is in
|
||||
# the Operating System repository or is a locally defined file whose
|
||||
# name is provided in https_local_certificate. Set to False
|
||||
# to skip https certification checking thus making the connection
|
||||
# insecure. Getting a certificate and setting https_verify to True
|
||||
# is strongly advised for production to prevent man-in-the-middle
|
||||
# attacks. The default is True for a secure connection.
|
||||
#
|
||||
# Defaults to undef.
|
||||
#
|
||||
# [*https_local_certificate*]
|
||||
# (not used) Configure a local certificate file to present in https
|
||||
# requests. For experimental purpose when an official certificate
|
||||
# from a Trusted Certificate Authority is not yet available.
|
||||
#
|
||||
# Defaults to undef.
|
||||
#
|
||||
|
||||
|
||||
define neutron::plugins::ml2::cisco::nexus_creds(
|
||||
# Not used parameters
|
||||
$username,
|
||||
$password,
|
||||
$servers,
|
||||
# Used parameters
|
||||
$ip_address,
|
||||
$nve_src_intf = undef,
|
||||
$physnet = undef,
|
||||
$vpc_pool = undef,
|
||||
$intfcfg_portchannel = undef,
|
||||
$https_verify = undef,
|
||||
$https_local_certificate = undef,
|
||||
|
||||
) {
|
||||
include neutron::deps
|
||||
|
||||
ensure_resource('file', '/var/lib/neutron/.ssh',
|
||||
{
|
||||
ensure => directory,
|
||||
owner => 'neutron',
|
||||
tag => 'neutron-config-file',
|
||||
}
|
||||
)
|
||||
}
|
||||
@ -1,132 +0,0 @@
|
||||
# == Define: neutron::plugins::ml2::cisco::nexus_switch
|
||||
#
|
||||
# Defined type to configure the Cisco Nexus Switch parameters
|
||||
# for use by the ML2 Mech Driver for Cisco Nexus Switches.
|
||||
#
|
||||
# More info available here:
|
||||
# http://networking-cisco.readthedocs.io
|
||||
#
|
||||
#
|
||||
# neutron::plugins::ml2::cisco::nexus_switch used by
|
||||
# neutron::plugins::ml2::cisco::nexus
|
||||
#
|
||||
# === Parameters:
|
||||
# [*username*]
|
||||
# (required) The username for logging into the switch to manage it.
|
||||
#
|
||||
# [*password*]
|
||||
# (required) The password for logging into the switch to manage it.
|
||||
#
|
||||
# [*ip_address*]
|
||||
# (required) The IP address of the switch.
|
||||
#
|
||||
# [*servers*]
|
||||
# (required) A hash of server names (key) mapped to the switch's
|
||||
# interfaces (value). For each host connected to a port on the
|
||||
# switch, specify the hostname and the Nexus physical port/s
|
||||
# (interface/s) it is connected to. The values in the hash can
|
||||
# be a comma separated list of interfaces mapped to the server.
|
||||
#
|
||||
# Hash Format:
|
||||
#
|
||||
# {
|
||||
# <hostname1> => {"ports" => "<interfaceID1>,<interfaceID2>, ..."},
|
||||
# <hostname2> => {"ports" => "<interfaceID1>,<interfaceID2>, ..."},
|
||||
# }
|
||||
#
|
||||
# Interface ID format options:
|
||||
# "<intf_type>:<position>"
|
||||
# Valid intf_type's are 'ethernet' and 'port-channel'.
|
||||
# The default setting for <intf_type:> is 'ethernet' and need not be
|
||||
# added to this setting.
|
||||
#
|
||||
# Example:
|
||||
# {
|
||||
# 'control1' => {"ports" => 'ethernet:1/1'},
|
||||
# 'control2' => {"ports" => 'ethernet:1/2'},
|
||||
# 'compute1' => {"ports" => '1/3,1/4'}
|
||||
# }
|
||||
#
|
||||
# [*switchname*]
|
||||
# (required) An identifier for the switch--ie. hostname or IP
|
||||
# address of the switch.
|
||||
#
|
||||
# [*nve_src_intf*]
|
||||
# (optional) Only valid if VXLAN overlay is configured and
|
||||
# vxlan_global_config is set to True.
|
||||
#
|
||||
# The NVE source interface is a loopback interface that is configured on
|
||||
# the switch with valid /32 IP address. This /32 IP address must be known
|
||||
# by the transient devices in the transport network and the remote VTEPs.
|
||||
# This is accomplished by advertising it through a dynamic routing protocol
|
||||
# in the transport network. (NB: If no nve_src_intf is defined then a
|
||||
# default setting of 0 (creates "loopback0") will be used.)
|
||||
#
|
||||
# Defaults to $::os_service_default.
|
||||
#
|
||||
# [*physnet*]
|
||||
# (optional) Only valid if VXLAN overlay is configured.
|
||||
# The physical network name defined in the network_vlan_ranges variable
|
||||
# (defined under the ml2_type_vlan section) that this switch is controlling.
|
||||
# The configured 'physnet' is the physical network domain that is connected
|
||||
# to this switch. The vlan ranges defined in network_vlan_ranges for a
|
||||
# a physical network are allocated dynamically and are unique per physical
|
||||
# network. These dynamic vlans may be reused across physical networks.
|
||||
#
|
||||
# Defaults to $::os_service_default.
|
||||
#
|
||||
# [*vpc_pool*]
|
||||
# (optional) Required for Baremetal deployments and Port-Channel creation
|
||||
# is needed. This defines the pool of port-channel ids which are
|
||||
# available for port-channel creation.
|
||||
#
|
||||
# [*intfcfg_portchannel*]
|
||||
# (optional) For use with Baremetal deployments and custom port-channel
|
||||
# configuration is required during port-channel creation.
|
||||
#
|
||||
# [*https_verify*]
|
||||
# (optional) Set to True when certification authority (CA) file is in
|
||||
# the Operating System repository or is a locally defined file whose
|
||||
# name is provided in https_local_certificate. Set to False
|
||||
# to skip https certification checking thus making the connection
|
||||
# insecure. Getting a certificate and setting https_verify to True
|
||||
# is strongly advised for production to prevent man-in-the-middle
|
||||
# attacks. The default is true for a secure connection.
|
||||
#
|
||||
# [*https_local_certificate*]
|
||||
# (optional) Configure a local certificate file to present in https
|
||||
# requests. For experimental purpose when an official certificate
|
||||
# from a Trusted Certificate Authority is not yet available.
|
||||
#
|
||||
#
|
||||
define neutron::plugins::ml2::cisco::nexus_switch(
|
||||
$username,
|
||||
$password,
|
||||
$ip_address,
|
||||
$servers,
|
||||
$switchname = $title,
|
||||
$nve_src_intf = $::os_service_default,
|
||||
$physnet = $::os_service_default,
|
||||
$vpc_pool = $::os_service_default,
|
||||
$intfcfg_portchannel = $::os_service_default,
|
||||
$https_verify = $::os_service_default,
|
||||
$https_local_certificate = $::os_service_default
|
||||
) {
|
||||
|
||||
include neutron::deps
|
||||
|
||||
$section = "ML2_MECH_CISCO_NEXUS:${ip_address}"
|
||||
$port_mappings = template('neutron/nexus_switch_port_mappings.erb')
|
||||
neutron_plugin_ml2 {
|
||||
"${section}/username": value => $username;
|
||||
"${section}/password": value => $password, secret => true;
|
||||
"${section}/host_ports_mapping": value => $port_mappings;
|
||||
"${section}/nve_src_intf": value => $nve_src_intf;
|
||||
"${section}/physnet": value => $physnet;
|
||||
"${section}/vpc_pool": value => $vpc_pool;
|
||||
"${section}/intfcfg_portchannel": value => $intfcfg_portchannel;
|
||||
"${section}/https_verify": value => $https_verify;
|
||||
"${section}/https_local_certificate": value => $https_local_certificate;
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,36 +0,0 @@
|
||||
# == Define: neutron::plugins::ml2::cisco::nexus_switch_server
|
||||
#
|
||||
# Defined type to configure the Cisco Nexus Switch parameters
|
||||
# for servers connected to the switch for use by the ML2 Mech
|
||||
# Driver for Cisco Nexus Switches.
|
||||
#
|
||||
# More info available here:
|
||||
# http://networking-cisco.readthedocs.io
|
||||
#
|
||||
#
|
||||
# neutron::plugins::ml2::cisco::nexus_switch_server used by
|
||||
# neutron::plugins::ml2::cisco::nexus_switch
|
||||
#
|
||||
# === Parameters:
|
||||
# [*switch_ip_address*]
|
||||
# (required) The IP address for the switch.
|
||||
#
|
||||
# [*ports*]
|
||||
# (required) The switch ports connected to this server.
|
||||
#
|
||||
# [*hostname*]
|
||||
# (required) The hostname of a host connected to the switch.
|
||||
#
|
||||
define neutron::plugins::ml2::cisco::nexus_switch_server(
|
||||
$switch_ip_address,
|
||||
$ports,
|
||||
$hostname = $title,
|
||||
) {
|
||||
|
||||
include neutron::deps
|
||||
|
||||
$section = "ML2_MECH_CISCO_NEXUS:${switch_ip_address}"
|
||||
neutron_plugin_ml2 {
|
||||
"${section}/${hostname}": value => $ports;
|
||||
}
|
||||
}
|
||||
@ -1,32 +0,0 @@
|
||||
#
|
||||
# DEPRECATED !
|
||||
# Configure the Nexus VXLAN Type Driver
|
||||
# More info available here:
|
||||
# http://networking-cisco.readthedocs.io
|
||||
#
|
||||
# === Parameters
|
||||
#
|
||||
# [*vni_ranges*]
|
||||
# (required)
|
||||
# Comma-separated list of <vni_min>:<vni_max> tuples enumerating
|
||||
# ranges of VXLAN Network IDs that are available for tenant network
|
||||
# allocation.
|
||||
#
|
||||
# [*mcast_ranges*]
|
||||
# (required)
|
||||
# Multicast groups for the VXLAN interface. When configured, will
|
||||
# enable sending all broadcast traffic to this multicast group.
|
||||
# Comma separated list of min:max ranges of multicast IP's.
|
||||
# NOTE: must be a valid multicast IP, invalid IP's will be discarded
|
||||
# Example:
|
||||
# 224.0.0.1:224.0.0.3,224.0.1.1:224.0.1.3
|
||||
#
|
||||
|
||||
class neutron::plugins::ml2::cisco::type_nexus_vxlan (
|
||||
$vni_ranges,
|
||||
$mcast_ranges,
|
||||
) {
|
||||
|
||||
warning('Support for networking-cisco has been deprecated and has no effect')
|
||||
}
|
||||
|
||||
@ -1,62 +0,0 @@
|
||||
#
|
||||
# Configure the Mech Driver for Cisco UCSM plugin
|
||||
# More info available here:
|
||||
# http://networking-cisco.readthedocs.io
|
||||
#
|
||||
# === Parameters
|
||||
#
|
||||
# [*ucsm_ip*]
|
||||
# (required) IP address of the Cisco UCS Manager
|
||||
#
|
||||
# [*ucsm_username*]
|
||||
# (required) Username to connect to the UCS Manager
|
||||
#
|
||||
# [*ucsm_password*]
|
||||
# (required) Password to connect to the UCS Manager
|
||||
#
|
||||
# [*ucsm_host_list*]
|
||||
# (required)
|
||||
# Hostname to Service profile mapping for UCSM-controlled compute hosts
|
||||
# Example:
|
||||
# Hostname1:Serviceprofile1, Hostname2:Serviceprofile2
|
||||
#
|
||||
# [*supported_pci_devs*]
|
||||
# (optional) SR-IOV and VM-FEX vendors supported by this plugin
|
||||
# xxxx:yyyy represents vendor_id:product_id
|
||||
# Defaults to $::os_service_default
|
||||
# Example:
|
||||
# [ '2222:3333', '4444:5555' ]
|
||||
#
|
||||
# [*ucsm_https_verify*]
|
||||
# (optional) Set to False to turn off SSL certificate checking
|
||||
# while connecting to UCS Manager.
|
||||
# Defaults to True.
|
||||
#
|
||||
# [*sp_template_list*]
|
||||
# (optional) This configuration needs to be provided when
|
||||
# UCS Servers are controlled by Service Profile Templates.
|
||||
# Example:
|
||||
# sp_template_list = SP_Template1_path:SP_Template1:S1,S2
|
||||
# SP_Template2_path:SP_Template2:S3,S4,S5
|
||||
#
|
||||
# [*vnic_template_list*]
|
||||
# (optional) This configuration needs to be provided when vNICs
|
||||
# on UCS Servers are controlled by vNIC Templates.
|
||||
# Example:
|
||||
# vnic_template_list = physnet1:vnic_template_path1:vt1
|
||||
# physnet2:vnic_template_path2:vt2
|
||||
#
|
||||
class neutron::plugins::ml2::cisco::ucsm (
|
||||
$ucsm_ip,
|
||||
$ucsm_username,
|
||||
$ucsm_password,
|
||||
$ucsm_host_list,
|
||||
$sp_template_list,
|
||||
$vnic_template_list,
|
||||
$supported_pci_devs = $::os_service_default,
|
||||
$ucsm_https_verify = $::os_service_default,
|
||||
) {
|
||||
|
||||
warning('Support for networking-cisco has been deprecated and has no effect')
|
||||
}
|
||||
|
||||
@ -0,0 +1,5 @@
|
||||
---
|
||||
upgrade:
|
||||
- |
|
||||
Remaining implementations for networking-cisco support have been removed.
|
||||
These have had no effect since deprecation.
|
||||
Loading…
Reference in New Issue
Block a user