diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-03-25 01:17:47 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-03-25 01:17:47 +0000 |
| commit | e702aef3fee4e26cda3838403c25872f2d45e0e9 (patch) | |
| tree | 46c70b578353146181906d91a91f527d24eb2915 | |
| parent | 02841754dc8003534e75748a588d944c4d17c226 (diff) | |
| parent | ae10ae4a5a21bb58c183aa50f237ffa2d6f14280 (diff) | |
Merge "Fixes OpenDaylightProviderMappings hiera parsing"
| -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. |