diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-03-23 10:24:38 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2017-03-23 10:24:38 -0400 |
| commit | ae10ae4a5a21bb58c183aa50f237ffa2d6f14280 (patch) | |
| tree | 42f4f673cd82d3218af8bdba7cc89a676fee0314 | |
| parent | 8716d9f769dd17ef17fef7f0fdefaf0df6a7fe24 (diff) | |
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 <trozet@redhat.com>
| -rw-r--r-- | puppet/services/opendaylight-ovs.yaml | 6 | ||||
| -rw-r--r-- | releasenotes/notes/fix-odl-provider-mapping-hiera-5b3472184be490e2.yaml | 4 |
2 files changed, 5 insertions, 5 deletions
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. |