openstack/puppet-neutron
Code Issues Proposed changes

Fixes specifying OVSDB URIs with TLS for ODL OVS

Browse Source 
This fixes an issue with enabling TLS and specifying the OVSDB URI
connection parameters for the ovs::opendaylight class.  The settings
were not being propogated into the OVS manager configuration when
specified in the class.

Closes-Bug: 1744967

Change-Id: I004cffed10401a0132368375f0377a7aa45b5401
Signed-off-by: Tim Rozet <trozet@redhat.com>
This commit is contained in:
Tim Rozet 2018-01-23 11:40:46 -05:00
parent 65107cb5a8
commit 707fad6f89
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/plugins/ovs/opendaylight.pp
View File

@ -139,11 +139,15 @@ class neutron::plugins::ovs::opendaylight (
if $odl_ovsdb_iface =~ /^tcp/ { if $odl_ovsdb_iface =~ /^tcp/ {
warning('TLS enabled but odl_ovsdb_iface set to tcp. Will override to ssl') warning('TLS enabled but odl_ovsdb_iface set to tcp. Will override to ssl')
$odl_ovsdb_iface_parsed = regsubst($odl_ovsdb_iface, '^tcp', 'ssl') $odl_ovsdb_iface_parsed = regsubst($odl_ovsdb_iface, '^tcp', 'ssl')
} else {
$odl_ovsdb_iface_parsed = $odl_ovsdb_iface
} }
if $ovsdb_server_iface =~ /^ptcp/ { if $ovsdb_server_iface =~ /^ptcp/ {
warning('TLS enabled but ovsdb_server_iface set to ptcp. Will override to pssl') warning('TLS enabled but ovsdb_server_iface set to ptcp. Will override to pssl')
$ovsdb_server_iface_parsed = regsubst($ovsdb_server_iface, '^ptcp', 'pssl') $ovsdb_server_iface_parsed = regsubst($ovsdb_server_iface, '^ptcp', 'pssl')
} else {
$ovsdb_server_iface_parsed = $ovsdb_server_iface
} }
if $odl_check_url =~ /^http:/ { if $odl_check_url =~ /^http:/ {

6
releasenotes/notes/fix-odl-ovs-ssl-uri-5a8174ef6fd5a3d4.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
Fixes an issue with using TLS and specifying ovsdb_server_iface and
the odl_ovsdb_iface parameters with the plugins::ovs::opendaylight
class.

4
spec/classes/neutron_plugins_ovs_opendaylight_spec.rb
View File

@ -150,7 +150,9 @@ describe 'neutron::plugins::ovs::opendaylight' do
shared_examples_for 'with TLS enabled' do shared_examples_for 'with TLS enabled' do
it 'configures OVS for ODL' do it 'configures OVS for ODL' do
is_expected.to contain_exec('Add trusted cert: dummy.crt') is_expected.to contain_exec('Add trusted cert: dummy.crt')
is_expected.to contain_exec('Set OVS Manager to OpenDaylight') is_expected.to contain_exec('Set OVS Manager to OpenDaylight').with(
:command => "ovs-vsctl set-manager pssl:6639:127.0.0.1 ssl:127.0.0.1:6640"
)
is_expected.to contain_vs_config('other_config:local_ip') is_expected.to contain_vs_config('other_config:local_ip')
is_expected.not_to contain_vs_config('other_config:provider_mappings') is_expected.not_to contain_vs_config('other_config:provider_mappings')
is_expected.to contain_vs_config('external_ids:odl_os_hostconfig_hostid') is_expected.to contain_vs_config('external_ids:odl_os_hostconfig_hostid')