From a425a6f1ff1833da0ec5f42c7ca3f9ad952b54bf Mon Sep 17 00:00:00 2001 From: Carol Bouchard Date: Mon, 1 Oct 2018 10:05:41 -0400 Subject: [PATCH] CiscoNexus: Update and Remove deprecated vars Update and Remove deprecated variables from Cisco Nexus Config. * Deprecated variables include vlan_name_prefix, svi_round_robin, provider_vlan_name_prefix, persistent_switch_config, never_cache_ssh_connection, ssh_port, switch_replay_count, nexus_driver, and host_key_checks. * Change config replay to on by defaulting switch_heartbeat_time=30. * Replaced method of configurating host_ports_mapping config. Depends-On: Iee2f869c4054f1120d224994aba8c827f981e6c0 Change-Id: Ibda17afdcf7a6748f15390fd8a0a8b70bb6dfc2b Closes-bug: #1793381 --- .../neutron-ml2-cisco-nexus-ucsm.yaml | 8 --- .../neutron-ml2-cisco-nexus-ucsm.j2.yaml | 68 ------------------- 2 files changed, 76 deletions(-) diff --git a/environments/neutron-ml2-cisco-nexus-ucsm.yaml b/environments/neutron-ml2-cisco-nexus-ucsm.yaml index a1b90ec00e..f6d53d1653 100644 --- a/environments/neutron-ml2-cisco-nexus-ucsm.yaml +++ b/environments/neutron-ml2-cisco-nexus-ucsm.yaml @@ -15,17 +15,9 @@ parameter_defaults: NetworkUCSMVnicTemplateList: 'physnet1:vnic_template_path1:vt11 physnet2:vnic_template_path2:vt21' NetworkNexusConfig: {} NetworkNexusManagedPhysicalNetwork: '' - NetworkNexusVlanNamePrefix: 'q-' - NetworkNexusSviRoundRobin: 'false' - NetworkNexusProviderVlanNamePrefix: 'p-' - NetworkNexusPersistentSwitchConfig: 'false' - NetworkNexusNeverCacheSshConnection: 'false' NetworkNexusSwitchHeartbeatTime: 30 - NetworkNexusSwitchReplayCount: 3 - NetworkNexusCfgDriver: 'restapi' NetworkNexusProviderVlanAutoCreate: 'true' NetworkNexusProviderVlanAutoTrunk: 'true' NetworkNexusVxlanGlobalConfig: 'false' - NetworkNexusHostKeyChecks: 'false' NetworkNexusVxlanVniRanges: '0:0' NetworkNexusVxlanMcastRanges: '0.0.0.0:0.0.0.0' diff --git a/puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.j2.yaml b/puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.j2.yaml index 4c60113c35..8da4cf7f68 100644 --- a/puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.j2.yaml +++ b/puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.j2.yaml @@ -54,36 +54,6 @@ parameters: type: string description: The name of the physical_network default: '' - NetworkNexusVlanNamePrefix: - type: string - description: > - This configuration item is OBSOLETE. - A short prefix to prepend to the VLAN name - default: 'q-' - NetworkNexusSviRoundRobin: - type: boolean - description: > - This configuration item is OBSOLETE. - A flag to enable round robin scheduling - default: false - NetworkNexusProviderVlanNamePrefix: - type: string - description: > - This configuration item is OBSOLETE. - A short prefix to prepend to the VLAN name. - default: 'p-' - NetworkNexusPersistentSwitchConfig: - type: string - description: > - This config item will be deprecated. - To make Nexus device persistent. - default: false - NetworkNexusNeverCacheSshConnection: - type: string - description: > - This config item will be deprecated. - Prevent Cache of ssh connection - default: false NetworkNexusSwitchHeartbeatTime: type: number description: > @@ -91,22 +61,6 @@ parameters: object are seconds. Setting this object to a value of 0 disables the replay feature. default: 30 - NetworkNexusSwitchReplayCount: - type: number - description: > - This configuration item is OBSOLETE. The Nexus driver replay behavior - is to continue to attempt to connect to the down Nexus device with a - period equal to the heartbeat time interval. This was previously the - Number of times to attempt config replay. - default: 3 - NetworkNexusCfgDriver: - type: string - description: > - This will be deprecated. Lower-level configuration driver which sends - commands to the Nexus Device. Choices are 'restapi' or 'ncclient' - where the latter is being deprecated. So there is no longer a need for - this variable. - default: 'restapi' NetworkNexusProviderVlanAutoCreate: type: boolean description: A flag whether to manage the creation and removal of VLANs @@ -119,12 +73,6 @@ parameters: type: boolean description: A flag whether to manage the VXLAN global settings default: true - NetworkNexusHostKeyChecks: - type: boolean - description: > - This config item will be deprecated. It enables strict host key - checks when connecting to Nexus switches - default: false NetworkNexusVxlanVniRanges: type: string description: VXLAN Network IDs that are available for tenant network @@ -155,18 +103,10 @@ resources: neutron::plugins::ml2::cisco::ucsm::vnic_template_list: {get_input: UCSMVnicTemplateList} neutron::plugins::ml2::cisco::nexus::nexus_config: {get_input: NexusConfig} neutron::plugins::ml2::cisco::nexus::managed_physical_network: {get_input: NexusManagedPhysicalNetwork} - neutron::plugins::ml2::cisco::nexus::vlan_name_prefix: {get_input: NexusVlanNamePrefix} - neutron::plugins::ml2::cisco::nexus::svi_round_robin: {get_input: NexusSviRoundRobin} - neutron::plugins::ml2::cisco::nexus::provider_vlan_name_prefix: {get_input: NexusProviderVlanNamePrefix} - neutron::plugins::ml2::cisco::nexus::persistent_switch_config: {get_input: NexusPersistentSwitchConfig} - neutron::plugins::ml2::cisco::nexus::never_cache_ssh_connection: {get_input: NexusNeverCacheSshConnection} neutron::plugins::ml2::cisco::nexus::switch_heartbeat_time: {get_input: NexusSwitchHeartbeatTime} - neutron::plugins::ml2::cisco::nexus::switch_replay_count: {get_input: NexusSwitchReplayCount} - neutron::plugins::ml2::cisco::nexus::nexus_driver: {get_input: NexusCfgDriver} neutron::plugins::ml2::cisco::nexus::provider_vlan_auto_create: {get_input: NexusProviderVlanAutoCreate} neutron::plugins::ml2::cisco::nexus::provider_vlan_auto_trunk: {get_input: NexusProviderVlanAutoTrunk} neutron::plugins::ml2::cisco::nexus::vxlan_global_config: {get_input: NexusVxlanGlobalConfig} - neutron::plugins::ml2::cisco::nexus::host_key_checks: {get_input: NexusHostKeyChecks} neutron::plugins::ml2::cisco::type_nexus_vxlan::vni_ranges: {get_input: NexusVxlanVniRanges} neutron::plugins::ml2::cisco::type_nexus_vxlan::mcast_ranges: {get_input: NexusVxlanMcastRanges} @@ -187,18 +127,10 @@ resources: UCSMVnicTemplateList: {get_param: NetworkUCSMVnicTemplateList} NexusConfig: {get_attr: [MappingToNexusDeploymentsController, deploy_stdout]} NexusManagedPhysicalNetwork: {get_param: NetworkNexusManagedPhysicalNetwork} - NexusVlanNamePrefix: {get_param: NetworkNexusVlanNamePrefix} - NexusSviRoundRobin: {get_param: NetworkNexusSviRoundRobin} - NexusProviderVlanNamePrefix: {get_param: NetworkNexusProviderVlanNamePrefix} - NexusPersistentSwitchConfig: {get_param: NetworkNexusPersistentSwitchConfig} - NexusNeverCacheSshConnection: {get_param: NetworkNexusNeverCacheSshConnection} NexusSwitchHeartbeatTime: {get_param: NetworkNexusSwitchHeartbeatTime} - NexusSwitchReplayCount: {get_param: NetworkNexusSwitchReplayCount} - NexusCfgDriver: {get_param: NetworkNexusCfgDriver} NexusProviderVlanAutoCreate: {get_param: NetworkNexusProviderVlanAutoCreate} NexusProviderVlanAutoTrunk: {get_param: NetworkNexusProviderVlanAutoTrunk} NexusVxlanGlobalConfig: {get_param: NetworkNexusVxlanGlobalConfig} - NexusHostKeyChecks: {get_param: NetworkNexusHostKeyChecks} NexusVxlanVniRanges: {get_param: NetworkNexusVxlanVniRanges} NexusVxlanMcastRanges: {get_param: NetworkNexusVxlanMcastRanges}