diff --git a/environments/neutron-ml2-cisco-nexus-ucsm.yaml b/environments/neutron-ml2-cisco-nexus-ucsm.yaml index b0e1421867..a1b90ec00e 100644 --- a/environments/neutron-ml2-cisco-nexus-ucsm.yaml +++ b/environments/neutron-ml2-cisco-nexus-ucsm.yaml @@ -10,6 +10,9 @@ parameter_defaults: NetworkUCSMPassword: 'password' NetworkUCSMHostList: '12:34:56:78:9a:bc:profile1, 12:34:56:78:9a:de:profile2' 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: {} NetworkNexusManagedPhysicalNetwork: '' NetworkNexusVlanNamePrefix: 'q-' 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 0b6a6ae838..26a5683a0d 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 @@ -19,7 +19,8 @@ parameters: NetworkUCSMPassword: type: string description: Cisco UCSM password - default: password + default: '' + hidden: true NetworkUCSMHostList: type: string description: > @@ -31,6 +32,20 @@ parameters: type: string description: Cisco UCSM SR-IOV and VM-FEX vendors supported 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: type: json 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_host_list: {get_input: UCSM_host_list} 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::managed_physical_network: {get_input: NexusManagedPhysicalNetwork} neutron::plugins::ml2::cisco::nexus::vlan_name_prefix: {get_input: NexusVlanNamePrefix} @@ -164,6 +182,9 @@ resources: UCSM_password: {get_param: NetworkUCSMPassword} UCSM_host_list: {get_attr: [MappingToUCSMDeploymentsController, deploy_stdout]} UCSMSupportedPciDevs: {get_param: NetworkUCSMSupportedPciDevs} + UCSMHttpsVerify: {get_param: NetworkUCSMHttpsVerify} + UCSMSpTemplateList: {get_param: NetworkUCSMSpTemplateList} + UCSMVnicTemplateList: {get_param: NetworkUCSMVnicTemplateList} NexusConfig: {get_attr: [MappingToNexusDeploymentsController, deploy_stdout]} NexusManagedPhysicalNetwork: {get_param: NetworkNexusManagedPhysicalNetwork} NexusVlanNamePrefix: {get_param: NetworkNexusVlanNamePrefix} @@ -218,7 +239,7 @@ resources: properties: group: script inputs: - {%- for role in roles %} + {%- for role in roles %} - name: {{role.name}}_mappings {%- endfor %} - name: nexus_config