Fixes OpenDaylightProviderMappings hiera parsing
authorTim Rozet <trozet@redhat.com>
Thu, 23 Mar 2017 14:24:38 +0000 (10:24 -0400)
committerTim Rozet <trozet@redhat.com>
Thu, 23 Mar 2017 14:24:38 +0000 (10:24 -0400)
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>
puppet/services/opendaylight-ovs.yaml
releasenotes/notes/fix-odl-provider-mapping-hiera-5b3472184be490e2.yaml [new file with mode: 0644]

index 3db0848..5cf416f 100644 (file)
@@ -60,11 +60,7 @@ outputs:
         opendaylight_check_url: {get_param: OpenDaylightCheckURL}
         opendaylight::nb_connection_protocol: {get_param: OpenDaylightConnectionProtocol}
         neutron::agents::ml2::ovs::local_ip: {get_param: [ServiceNetMap, NeutronTenantNetwork]}
-        neutron::plugins::ovs::opendaylight::provider_mappings:
-          str_replace:
-            template: MAPPINGS
-            params:
-              MAPPINGS: {get_param: OpenDaylightProviderMappings}
+        neutron::plugins::ovs::opendaylight::provider_mappings: {get_param: OpenDaylightProviderMappings}
         tripleo.opendaylight_ovs.firewall_rules:
           '118 neutron vxlan networks':
              proto: 'udp'
diff --git a/releasenotes/notes/fix-odl-provider-mapping-hiera-5b3472184be490e2.yaml b/releasenotes/notes/fix-odl-provider-mapping-hiera-5b3472184be490e2.yaml
new file mode 100644 (file)
index 0000000..79cea05
--- /dev/null
@@ -0,0 +1,4 @@
+---
+fixes:
+  - Fixes OpenDaylightProviderMappings parsing on a
+    comma delimited list.