openstack/tripleo-heat-templates
Code Issues Proposed changes

Fixes OpenDaylightProviderMappings hiera parsing

Browse Source 
The str_replace conversion used previously is no longer needed and
breaks the hieradata value.

Closes-Bug: 1675426

Change-Id: I7a052d1757efe36daf6ed47e55598ca3c2ee9055
Signed-off-by: Tim Rozet <trozet@redhat.com>
This commit is contained in:
Tim Rozet 2017-03-23 10:24:38 -04:00
parent 8716d9f769
commit ae10ae4a5a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
puppet/services/opendaylight-ovs.yaml
View File

@ -60,11 +60,7 @@ outputs:
opendaylight_check_url: {get_param: OpenDaylightCheckURL} opendaylight_check_url: {get_param: OpenDaylightCheckURL}
opendaylight::nb_connection_protocol: {get_param: OpenDaylightConnectionProtocol} opendaylight::nb_connection_protocol: {get_param: OpenDaylightConnectionProtocol}
neutron::agents::ml2::ovs::local_ip: {get_param: [ServiceNetMap, NeutronTenantNetwork]} neutron::agents::ml2::ovs::local_ip: {get_param: [ServiceNetMap, NeutronTenantNetwork]}
neutron::plugins::ovs::opendaylight::provider_mappings: neutron::plugins::ovs::opendaylight::provider_mappings: {get_param: OpenDaylightProviderMappings}
str_replace:
template: MAPPINGS
params:
MAPPINGS: {get_param: OpenDaylightProviderMappings}
tripleo.opendaylight_ovs.firewall_rules: tripleo.opendaylight_ovs.firewall_rules:
'118 neutron vxlan networks': '118 neutron vxlan networks':
proto: 'udp' proto: 'udp'

4
releasenotes/notes/fix-odl-provider-mapping-hiera-5b3472184be490e2.yaml Normal file
View File

@ -0,0 +1,4 @@
---
fixes:
- Fixes OpenDaylightProviderMappings parsing on a
comma delimited list.