Merge "Latest Nexus Configuration Variables Updates"

environments/neutron-ml2-cisco-nexus-ucsm.yaml

@@ -16,8 +16,10 @@ parameter_defaults:
   NetworkNexusSviRoundRobin: 'false'
   NetworkNexusProviderVlanNamePrefix: 'p-'
   NetworkNexusPersistentSwitchConfig: 'false'
-  NetworkNexusSwitchHeartbeatTime: 0
+  NetworkNexusNeverCacheSshConnection: 'false'
+  NetworkNexusSwitchHeartbeatTime: 30
   NetworkNexusSwitchReplayCount: 3
+  NetworkNexusCfgDriver: 'restapi'
   NetworkNexusProviderVlanAutoCreate: 'true'
   NetworkNexusProviderVlanAutoTrunk: 'true'
   NetworkNexusVxlanGlobalConfig: 'false'

puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.j2.yaml

@@ -41,19 +41,33 @@ parameters:
     default: ''
   NetworkNexusVlanNamePrefix:
     type: string
-    description: A short prefix to prepend to the VLAN name
+    description:  >
+      This configuration item is OBSOLETE.
+      A short prefix to prepend to the VLAN name
     default: 'q-'
   NetworkNexusSviRoundRobin:
     type: boolean
-    description: A flag to enable round robin scheduling
+    description:  >
+      This configuration item is OBSOLETE.
+      A flag to enable round robin scheduling
     default: false
   NetworkNexusProviderVlanNamePrefix:
     type: string
-    description:  A short prefix to prepend to the VLAN name
+    description:  >
+      This configuration item is OBSOLETE.
+      A short prefix to prepend to the VLAN name.
     default: 'p-'
   NetworkNexusPersistentSwitchConfig:
     type: string
-    description: To make Nexus device persistent
+    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
@@ -61,7 +75,7 @@ parameters:
       Time interval to check the state of the Nexus device. The units of this
       object are seconds.  Setting this object to a value of 0 disables the
       replay feature.
-    default: 0
+    default: 30
   NetworkNexusSwitchReplayCount:
     type: number
     description: >
@@ -70,6 +84,14 @@ parameters:
       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
@@ -84,7 +106,9 @@ parameters:
     default: true
   NetworkNexusHostKeyChecks:
     type: boolean
-    description: enable strict host key checks when connecting to Nexus switches
+    description: >
+      This config item will be deprecated.  It enables strict host key
+      checks when connecting to Nexus switches
     default: false
   NetworkNexusVxlanVniRanges:
     type: string
@@ -117,8 +141,10 @@ resources:
               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}
@@ -144,8 +170,10 @@ resources:
         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}