openstack/tripleo-heat-templates
Code Issues Proposed changes

Cisco Nexus ML2 MD: Need unique key for server level keys in hieradata

Browse Source 
Due to a limitation in the puppet version used in RHEL7 there is no simple
way to scope a 2nd level hiera hash key with the create_resources + defined
types pattern.  Lack of the .each method support prior to puppet 4.0 is the
problem here.  This template change works around the problem by explicitly
adding the hostname to the hieradata for a server under a nexus switch.

The duplicate server names under different switches is needed for vPC
config scenarios.

Closes-bug: #1506546
Change-Id: I03b866fb440e968c9f86ae93942b687e7165a065
This commit is contained in:
tiswanso 2015-10-06 11:33:05 -04:00
parent d29003ac6d
commit 588430a7f2
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.yaml
View File

@ -265,10 +265,14 @@ resources:
for (mac,swport) in nexus[nexus_switch]['servers'].iteritems():
lmac=mac.lower()
if lmac in mac2host:
if mac2host[lmac] in nexus_cp[nexus_switch]['servers']:
nexus_cp[nexus_switch]['servers'][mac2host[lmac]]['ports'] += ',' + swport['ports']
hostname = mac2host[lmac]
# for puppet we need a unique title even at the 2nd key level
serv_key = nexus_switch + "::" + hostname
if serv_key in nexus_cp[nexus_switch]['servers']:
nexus_cp[nexus_switch]['servers'][serv_key]['ports'] += ',' + swport['ports']
else:
nexus_cp[nexus_switch]['servers'][mac2host[lmac]] = swport
nexus_cp[nexus_switch]['servers'][serv_key] = swport
nexus_cp[nexus_switch]['servers'][serv_key]['hostname'] = hostname
del nexus_cp[nexus_switch]['servers'][mac]
# Note this echo means you can view the data via heat deployment-show
print json.dumps(nexus_cp)