From b72f98538cad05be8b2c42a46dec78fe0b288008 Mon Sep 17 00:00:00 2001 From: David Vallee Delisle Date: Tue, 4 May 2021 17:24:50 -0400 Subject: [PATCH] Fixing section ovsdb_connection The correct setting should be `vif_plug_ovs/ovsdb_connection` Change-Id: I59b7b15301c7faca8ec87cbc22c6fd2b2e64c351 --- manifests/init.pp | 3 ++- spec/classes/nova_init_spec.rb | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 93634aa3a..576842b36 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -805,7 +805,8 @@ but should be one of: ssh-rsa, ssh-dsa, ssh-ecdsa.") } nova_config { - 'DEFAULT/ovsdb_connection': value => $ovsdb_connection; + 'DEFAULT/ovsdb_connection': ensure => 'absent'; + 'vif_plug_ovs/ovsdb_connection': value => $ovsdb_connection; 'notifications/notification_format': value => $notification_format; # Following may need to be broken out to different nova services 'DEFAULT/state_path': value => $state_path; diff --git a/spec/classes/nova_init_spec.rb b/spec/classes/nova_init_spec.rb index c9cd5b9ec..efea9472d 100644 --- a/spec/classes/nova_init_spec.rb +++ b/spec/classes/nova_init_spec.rb @@ -49,7 +49,7 @@ describe 'nova' do is_expected.to contain_nova_config('DEFAULT/service_down_time').with_value('60') is_expected.to contain_nova_config('DEFAULT/rootwrap_config').with_value('/etc/nova/rootwrap.conf') is_expected.to contain_nova_config('DEFAULT/report_interval').with_value('10') - is_expected.to contain_nova_config('DEFAULT/ovsdb_connection').with_value('') + is_expected.to contain_nova_config('vif_plug_ovs/ovsdb_connection').with_value('') is_expected.to contain_nova_config('DEFAULT/transport_url').with_value('') is_expected.to contain_nova_config('DEFAULT/rpc_response_timeout').with_value('') is_expected.to contain_nova_config('DEFAULT/long_rpc_timeout').with_value('') @@ -175,7 +175,7 @@ describe 'nova' do is_expected.to contain_nova_config('oslo_messaging_notifications/topics').with_value('openstack') is_expected.to contain_nova_config('notifications/notification_format').with_value('unversioned') is_expected.to contain_nova_config('DEFAULT/report_interval').with_value('60') - is_expected.to contain_nova_config('DEFAULT/ovsdb_connection').with_value('tcp:127.0.0.1:6640') + is_expected.to contain_nova_config('vif_plug_ovs/ovsdb_connection').with_value('tcp:127.0.0.1:6640') is_expected.to contain_nova_config('DEFAULT/ssl_only').with_value(true) is_expected.to contain_nova_config('DEFAULT/cert').with_value('/etc/ssl/private/snakeoil.pem') is_expected.to contain_nova_config('DEFAULT/key').with_value('/etc/ssl/certs/snakeoil.pem')