diff options
| author |   Steven Hardy <shardy@redhat.com> | 2015-09-10 10:17:16 -0400 |
|---|---|---|
| committer | Steven Hardy <shardy@redhat.com> | 2015-09-17 15:50:39 +0100 |
| commit | 81785633bd33b3e5c8cf47c39b8ea2525b7e630a (patch) | |
| tree | bc28ce7ec515519c42c5229924bb3274118bbdd6 /environments | |
| parent | 196e6f3ff6cb9d261d8c8f872d43deb129b1a2e8 (diff) | |
Port Cisco Nexus/UCSM ExtraConfig to AllNodes
Switch the implemention from a pre_deploy ExtraConfig to an
AllNodesExtraConfig, so we can collect the mac->hostname mapping
for all nodes, then calculate a NexusConfig based on that and
a provided mapping of switch ports to mac address.
The same conversion is also done to the NetworkUCSMHostList:
The port mappings are provided via parameter_defaults like:
parameter_defaults:
NetworkNexusConfig: {
"bxb-tor-1": {
"username": "admin",
"ssh_port": 22,
"password": "lab",
"ip_address": "10.86.7.204",
"nve_src_intf": 0,
"physnet": "datacentre",
"servers": {
"fa:16:3e:fa:be:ef": "1/11",
"fa:16:3e:fa:5e:cf": "1/23",
"fa:16:3e:fa:12:34": "2/34"
}
}
}
NetworkUCSMHostList: 'fa:16:3e:fa:be:ef:profile1'
This results in an entry like this appended to
/etc/puppet/hieradata/neutron_cisco_data.yaml:
neutron::plugins::ml2::cisco::nexus::nexus_config:\
{"bxb-tor-1": {"username": "admin", "nve_src_intf": 0, "ssh_port": 22,
"servers": {"overcloud-compute02": "2/34", "overcloud-compute01": "1/23",
"overcloud-control01": "1/11"}, "password": "lab", "ip_address": "10.86.7.204",
"physnet": "datacentre"}}
neutron::plugins::ml2::cisco::ucsm::ucsm_host_list: overcloud-control01:profile1
Co-Authored-By: Rob Pothier <rpothier@cisco.com>
Co-Authored-By: Tim Swanson <tiswanso@cisco.com>
Change-Id: I372c3ffb6bd85b7239fcb9f3fc4fa51cd4a39332
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/neutron-ml2-cisco-nexus-ucsm.yaml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/environments/neutron-ml2-cisco-nexus-ucsm.yaml b/environments/neutron-ml2-cisco-nexus-ucsm.yaml index c291634c..5a1a32a3 100644 --- a/environments/neutron-ml2-cisco-nexus-ucsm.yaml +++ b/environments/neutron-ml2-cisco-nexus-ucsm.yaml @@ -1,13 +1,13 @@ # A Heat environment file which can be used to enable a # a Cisco Neutron plugin. resource_registry: - OS::TripleO::ControllerExtraConfigPre: ../puppet/extraconfig/pre_deploy/controller/network-cisco.yaml + OS::TripleO::AllNodesExtraConfig: ../puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.yaml parameter_defaults: NetworkUCSMIp: '127.0.0.1' NetworkUCSMUsername: 'admin' NetworkUCSMPassword: 'password' - NetworkUCSMHostList: 'host1:profile1, host2:profile2' + NetworkUCSMHostList: '12:34:56:78:9a:bc:profile1, 12:34:56:78:9a:de:profile2' NetworkUCSMSupportedPciDevs: '' NetworkNexusConfig: {} NetworkNexusManagedPhysicalNetwork: '' @@ -23,4 +23,3 @@ parameter_defaults: NetworkNexusHostKeyChecks: 'false' NetworkNexusVxlanVniRanges: '0:0' NetworkNexusVxlanMcastRanges: '0.0.0.0:0.0.0.0' - |