diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-03-23 10:24:38 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2017-03-25 01:19:28 +0000 |
| commit | a17f6c6816b617c9ba5cbc2079f02f6cd2e0d492 (patch) | |
| tree | 629335d77636d7f1acf88eaa011f78207522fb7f /puppet/services | |
| parent | f59578b4181709cffbf38ef091672cd365a503af (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>
(cherry picked from commit ae10ae4a5a21bb58c183aa50f237ffa2d6f14280)
Diffstat (limited to 'puppet/services')
| -rw-r--r-- | puppet/services/opendaylight-ovs.yaml | 6 |
1 files changed, 1 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' |