Adding new config parameters for Cisco UCSM ML2 driver
UCSM ML2 driver now supports the following additional configuration parameters: 1. ucsm_https_verify 2. sp_template_list 3. vnic_template_list Change-Id: Ie74f1b9653894f8c717156beb604dae9d9e60e6a
This commit is contained in:
parent
7777f7b02e
commit
b2d76220f0
|
@ -10,6 +10,9 @@ parameter_defaults:
|
||||||
NetworkUCSMPassword: 'password'
|
NetworkUCSMPassword: 'password'
|
||||||
NetworkUCSMHostList: '12:34:56:78:9a:bc:profile1, 12:34:56:78:9a:de:profile2'
|
NetworkUCSMHostList: '12:34:56:78:9a:bc:profile1, 12:34:56:78:9a:de:profile2'
|
||||||
NetworkUCSMSupportedPciDevs: ''
|
NetworkUCSMSupportedPciDevs: ''
|
||||||
|
NetworkUCSMHttpsVerify: 'true'
|
||||||
|
NetworkUCSMSpTemplateList: 'SP_Template1_path:SP_Template1:Host1,Host2 SP_Template2_path:SP_Template2:Host3,Host4'
|
||||||
|
NetworkUCSMVnicTemplateList: 'physnet1:vnic_template_path1:vt11 physnet2:vnic_template_path2:vt21'
|
||||||
NetworkNexusConfig: {}
|
NetworkNexusConfig: {}
|
||||||
NetworkNexusManagedPhysicalNetwork: ''
|
NetworkNexusManagedPhysicalNetwork: ''
|
||||||
NetworkNexusVlanNamePrefix: 'q-'
|
NetworkNexusVlanNamePrefix: 'q-'
|
||||||
|
|
|
@ -19,7 +19,8 @@ parameters:
|
||||||
NetworkUCSMPassword:
|
NetworkUCSMPassword:
|
||||||
type: string
|
type: string
|
||||||
description: Cisco UCSM password
|
description: Cisco UCSM password
|
||||||
default: password
|
default: ''
|
||||||
|
hidden: true
|
||||||
NetworkUCSMHostList:
|
NetworkUCSMHostList:
|
||||||
type: string
|
type: string
|
||||||
description: >
|
description: >
|
||||||
|
@ -31,6 +32,20 @@ parameters:
|
||||||
type: string
|
type: string
|
||||||
description: Cisco UCSM SR-IOV and VM-FEX vendors supported
|
description: Cisco UCSM SR-IOV and VM-FEX vendors supported
|
||||||
default: ''
|
default: ''
|
||||||
|
NetworkUCSMHttpsVerify:
|
||||||
|
type: boolean
|
||||||
|
description: >
|
||||||
|
Enabling/disabling UCS Manager SSL certificate verification
|
||||||
|
default: true
|
||||||
|
NetworkUCSMSpTemplateList:
|
||||||
|
type: string
|
||||||
|
description: Host to Service Profile Template mapping with its path
|
||||||
|
default: ''
|
||||||
|
NetworkUCSMVnicTemplateList:
|
||||||
|
type: string
|
||||||
|
description: >
|
||||||
|
Neutron physical network to vNIC Template mapping with its path
|
||||||
|
default: ''
|
||||||
NetworkNexusConfig:
|
NetworkNexusConfig:
|
||||||
type: json
|
type: json
|
||||||
description: Nexus switch configuration
|
description: Nexus switch configuration
|
||||||
|
@ -135,6 +150,9 @@ resources:
|
||||||
neutron::plugins::ml2::cisco::ucsm::ucsm_password: {get_input: UCSM_password}
|
neutron::plugins::ml2::cisco::ucsm::ucsm_password: {get_input: UCSM_password}
|
||||||
neutron::plugins::ml2::cisco::ucsm::ucsm_host_list: {get_input: UCSM_host_list}
|
neutron::plugins::ml2::cisco::ucsm::ucsm_host_list: {get_input: UCSM_host_list}
|
||||||
neutron::plugins::ml2::cisco::ucsm::supported_pci_devs: {get_input: UCSMSupportedPciDevs}
|
neutron::plugins::ml2::cisco::ucsm::supported_pci_devs: {get_input: UCSMSupportedPciDevs}
|
||||||
|
neutron::plugins::ml2::cisco::ucsm::ucsm_https_verify: {get_input: UCSMHttpsVerify}
|
||||||
|
neutron::plugins::ml2::cisco::ucsm::sp_template_list: {get_input: UCSMSpTemplateList}
|
||||||
|
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::nexus_config: {get_input: NexusConfig}
|
||||||
neutron::plugins::ml2::cisco::nexus::managed_physical_network: {get_input: NexusManagedPhysicalNetwork}
|
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::vlan_name_prefix: {get_input: NexusVlanNamePrefix}
|
||||||
|
@ -164,6 +182,9 @@ resources:
|
||||||
UCSM_password: {get_param: NetworkUCSMPassword}
|
UCSM_password: {get_param: NetworkUCSMPassword}
|
||||||
UCSM_host_list: {get_attr: [MappingToUCSMDeploymentsController, deploy_stdout]}
|
UCSM_host_list: {get_attr: [MappingToUCSMDeploymentsController, deploy_stdout]}
|
||||||
UCSMSupportedPciDevs: {get_param: NetworkUCSMSupportedPciDevs}
|
UCSMSupportedPciDevs: {get_param: NetworkUCSMSupportedPciDevs}
|
||||||
|
UCSMHttpsVerify: {get_param: NetworkUCSMHttpsVerify}
|
||||||
|
UCSMSpTemplateList: {get_param: NetworkUCSMSpTemplateList}
|
||||||
|
UCSMVnicTemplateList: {get_param: NetworkUCSMVnicTemplateList}
|
||||||
NexusConfig: {get_attr: [MappingToNexusDeploymentsController, deploy_stdout]}
|
NexusConfig: {get_attr: [MappingToNexusDeploymentsController, deploy_stdout]}
|
||||||
NexusManagedPhysicalNetwork: {get_param: NetworkNexusManagedPhysicalNetwork}
|
NexusManagedPhysicalNetwork: {get_param: NetworkNexusManagedPhysicalNetwork}
|
||||||
NexusVlanNamePrefix: {get_param: NetworkNexusVlanNamePrefix}
|
NexusVlanNamePrefix: {get_param: NetworkNexusVlanNamePrefix}
|
||||||
|
@ -218,7 +239,7 @@ resources:
|
||||||
properties:
|
properties:
|
||||||
group: script
|
group: script
|
||||||
inputs:
|
inputs:
|
||||||
{%- for role in roles %}
|
{%- for role in roles %}
|
||||||
- name: {{role.name}}_mappings
|
- name: {{role.name}}_mappings
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
- name: nexus_config
|
- name: nexus_config
|
||||||
|
|
Loading…
Reference in New Issue