openstack/puppet-nova
Code Issues Proposed changes

Merge "Fix notify_api_faults and notify_on_state_change options"

Browse Source
This commit is contained in:
Jenkins
2017-06-12 18:06:38 +00:00
committed by Gerrit Code Review
parent 06349b5830 3f92b4db49
commit c3bf1be2b3
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/init.pp
View File

@@ -746,7 +746,7 @@ but should be one of: ssh-rsa, ssh-dsa, ssh-ecdsa.")
nova_config {
'cinder/catalog_info': value => $cinder_catalog_info;
'os_vif_linux_bridge/use_ipv6': value => $use_ipv6;
'DEFAULT/notify_api_faults': value => $notify_api_faults;
'notifications/notify_api_faults': value => $notify_api_faults;
# Following may need to be broken out to different nova services
'DEFAULT/state_path': value => $state_path;
'DEFAULT/service_down_time': value => $service_down_time;
@@ -760,10 +760,10 @@ but should be one of: ssh-rsa, ssh-dsa, ssh-ecdsa.")
if $notify_on_state_change and $notify_on_state_change in ['vm_state', 'vm_and_task_state'] {
nova_config {
'DEFAULT/notify_on_state_change': value => $notify_on_state_change;
'notifications/notify_on_state_change': value => $notify_on_state_change;
}
} else {
nova_config { 'DEFAULT/notify_on_state_change': ensure => absent; }
nova_config { 'notifications/notify_on_state_change': ensure => absent; }
}
nova_config {

6
spec/classes/nova_init_spec.rb
View File

@@ -178,7 +178,7 @@ describe 'nova' do
is_expected.to contain_nova_config('oslo_messaging_notifications/transport_url').with_value('rabbit://rabbit_user:password@localhost:5673')
is_expected.to contain_nova_config('oslo_messaging_notifications/driver').with_value('ceilometer.compute.nova_notifier')
is_expected.to contain_nova_config('oslo_messaging_notifications/topics').with_value('openstack')
is_expected.to contain_nova_config('DEFAULT/notify_api_faults').with_value(true)
is_expected.to contain_nova_config('notifications/notify_api_faults').with_value(true)
is_expected.to contain_nova_config('DEFAULT/report_interval').with_value('60')
is_expected.to contain_nova_config('os_vif_linux_bridge/use_ipv6').with_value('true')
is_expected.to contain_nova_config('cinder/os_region_name').with_value('MyRegion')
@@ -204,7 +204,7 @@ describe 'nova' do
end
it 'configures database' do
is_expected.to contain_nova_config('DEFAULT/notify_on_state_change').with_ensure('absent')
is_expected.to contain_nova_config('notifications/notify_on_state_change').with_ensure('absent')
end
end
@@ -214,7 +214,7 @@ describe 'nova' do
end
it 'configures database' do
is_expected.to contain_nova_config('DEFAULT/notify_on_state_change').with_value('vm_state')
is_expected.to contain_nova_config('notifications/notify_on_state_change').with_value('vm_state')
end
end