From a17f6c6816b617c9ba5cbc2079f02f6cd2e0d492 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Thu, 23 Mar 2017 10:24:38 -0400 Subject: Fixes OpenDaylightProviderMappings hiera parsing 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 (cherry picked from commit ae10ae4a5a21bb58c183aa50f237ffa2d6f14280) --- puppet/services/opendaylight-ovs.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'puppet/services/opendaylight-ovs.yaml') diff --git a/puppet/services/opendaylight-ovs.yaml b/puppet/services/opendaylight-ovs.yaml index 3db0848e..5cf416f3 100644 --- a/puppet/services/opendaylight-ovs.yaml +++ b/puppet/services/opendaylight-ovs.yaml @@ -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' -- cgit 1.2.3-korg