Fixing section ovsdb_connection
The correct setting should be `vif_plug_ovs/ovsdb_connection` Conflicts: manifests/init.pp spec/classes/nova_init_spec.rb NOTE(dvd): b82062 Introducing default_tls_verify Change-Id: I59b7b15301c7faca8ec87cbc22c6fd2b2e64c351 (cherry picked from commitb72f98538c
) (cherry picked from commit86838f550b
) (cherry picked from commit3d17b57bff
)
This commit is contained in:
parent
b82062fc2e
commit
736be63abd
|
@ -749,7 +749,8 @@ but should be one of: ssh-rsa, ssh-dsa, ssh-ecdsa.")
|
|||
|
||||
nova_config {
|
||||
'cinder/catalog_info': value => $cinder_catalog_info;
|
||||
'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;
|
||||
|
|
|
@ -48,7 +48,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('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_nova_config('vif_plug_ovs/ovsdb_connection').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_nova_config('DEFAULT/transport_url').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_nova_config('DEFAULT/rpc_response_timeout').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_nova_config('DEFAULT/control_exchange').with_value('<SERVICE DEFAULT>')
|
||||
|
@ -181,9 +181,9 @@ 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('cinder/os_region_name').with_value('MyRegion')
|
||||
is_expected.to contain_nova_config('cinder/cross_az_attach').with_value('MyAZ')
|
||||
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')
|
||||
|
|
Loading…
Reference in New Issue