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 +----- .../notes/fix-odl-provider-mapping-hiera-5b3472184be490e2.yaml | 4 ++++ 2 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 releasenotes/notes/fix-odl-provider-mapping-hiera-5b3472184be490e2.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' 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 index 00000000..79cea05e --- /dev/null +++ b/releasenotes/notes/fix-odl-provider-mapping-hiera-5b3472184be490e2.yaml @@ -0,0 +1,4 @@ +--- +fixes: + - Fixes OpenDaylightProviderMappings parsing on a + comma delimited list. -- cgit 1.2.3-korg