diff options
| author |   tiswanso <tiswanso@cisco.com> | 2015-09-14 15:46:29 -0400 |
|---|---|---|
| committer |   Steven Hardy <shardy@redhat.com> | 2015-09-17 15:50:39 +0100 |
| commit | 210ade81937dacd3eda9478d2806057ef7b1fead (patch) | |
| tree | 21153d8d982b37bdb520568cd2a9f1fa45ffc1db /puppet/extraconfig/all_nodes | |
| parent | 81785633bd33b3e5c8cf47c39b8ea2525b7e630a (diff) | |
Support new form of servers config for ML2 cisco nexus allnodes config.
The puppet-neutron changes to remove the usage of ERB templates require
changing the format of the 'servers' hash/dictionary to include a key
for use with puppet's create_resources directly from hiera data.
Depends-On: I401371c9e5176de7ce19d4d4e878e9f2e69aab80
Change-Id: I950b7fb019dd8dd072592618b968a19df5c9c884
Diffstat (limited to 'puppet/extraconfig/all_nodes')
| -rw-r--r-- | puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.yaml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.yaml b/puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.yaml index c873ef31..277b0747 100644 --- a/puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.yaml +++ b/puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.yaml @@ -257,8 +257,7 @@ resources: lmac=mac.lower() if lmac in mac2host: if mac2host[lmac] in nexus_cp[nexus_switch]['servers']: - cur_swports = nexus_cp[nexus_switch]['servers'][mac2host[lmac]] - nexus_cp[nexus_switch]['servers'][mac2host[lmac]] = cur_swports + ',' + swport + nexus_cp[nexus_switch]['servers'][mac2host[lmac]]['ports'] += ',' + swport['ports'] else: nexus_cp[nexus_switch]['servers'][mac2host[lmac]] = swport del nexus_cp[nexus_switch]['servers'][mac] |