openstack
/
puppet-nova
Code Issues Proposed changes

Merge "Deprecate unused notify_on_api_faults parameter"

This commit is contained in:
Zuul 2018-08-25 16:46:31 +00:00 committed by Gerrit Code Review
parent 8e3cd419ad 3a5199e5f7
commit 5d1889b153
3 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
manifests/init.pp
View File

@ -302,11 +302,6 @@
# (optional) Format used for OpenStack notifications
# Defaults to ::os_service_default
#
# [*notify_on_api_faults*]
# (optional) If set, send api.fault notifications on caught
# exceptions in the API service
# Defaults to false
#
# [*notify_on_state_change*]
# (optional) If set, send compute.instance.update notifications
# on instance state changes. Valid values are None for no notifications,
@ -441,6 +436,10 @@
#
# [*image_service*]
# (optional) Service used to search for and retrieve images.
#
# [*notify_on_api_faults*]
# (optional) If set, send api.fault notifications on caught
# exceptions in the API service
# Defaults to undef
#
class nova(
@ -515,7 +514,6 @@ class nova(
$notification_driver = $::os_service_default,
$notification_topics = $::os_service_default,
$notification_format = $::os_service_default,
$notify_on_api_faults = false,
$notify_on_state_change = undef,
$os_region_name = $::os_service_default,
$ovsdb_connection = $::os_service_default,
@ -543,6 +541,7 @@ class nova(
$log_dir = undef,
$debug = undef,
$image_service = undef,
$notify_on_api_faults = undef,
) inherits nova::params {
include ::nova::deps
@ -564,10 +563,12 @@ and nova::debug is deprecated and has been moved to nova::logging class, please
}
if $notify_api_faults {
warning('The notify_api_faults parameter is deprecated. Please use \
nova::notify_on_api_faults instead.')
warning('The notify_api_faults parameter is deprecated.')
}
if $notify_on_api_faults {
warning('The notify_on_api_faults parameter is deprecated.')
}
$notify_on_api_faults_real = pick($notify_api_faults, $notify_on_api_faults)
if $image_service {
warning('The unused image_service parameter is deprecated, as we are \
@ -754,7 +755,6 @@ but should be one of: ssh-rsa, ssh-dsa, ssh-ecdsa.")
'cinder/catalog_info': value => $cinder_catalog_info;
'os_vif_linux_bridge/use_ipv6': value => $use_ipv6;
'DEFAULT/ovsdb_connection': value => $ovsdb_connection;
'notifications/notify_on_api_faults': value => $notify_on_api_faults_real;
'notifications/notification_format': value => $notification_format;
# Following may need to be broken out to different nova services
'DEFAULT/state_path': value => $state_path;

6
releasenotes/notes/deprecate_notify_on_api_faults-c7eb47adc3c92671.yaml Normal file
View File

@ -0,0 +1,6 @@
---
deprecations:
- |
The ``notify_on_api_faults`` parameter is deprecated as
it is also removed from nova config options in change
``https://review.openstack.org/#/c/505164``.

13
spec/classes/nova_init_spec.rb
View File

@ -93,7 +93,6 @@ describe 'nova' do
:notification_driver => 'ceilometer.compute.nova_notifier',
:notification_topics => 'openstack',
:notification_format => 'unversioned',
:notify_on_api_faults => true,
:report_interval => '60',
:os_region_name => 'MyRegion',
:ovsdb_connection => 'tcp:127.0.0.1:6640',
@ -174,7 +173,6 @@ describe 'nova' do
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('notifications/notification_format').with_value('unversioned')
is_expected.to contain_nova_config('notifications/notify_on_api_faults').with_value(true)
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('os_vif_linux_bridge/use_ipv6').with_value('true')
@ -218,17 +216,6 @@ describe 'nova' do
end
end
context 'with deprecated notify_api_faults parameter' do
let :params do
{ :notify_on_api_faults => :undef,
:notify_api_faults => 'true' }
end
it 'configures notify_on_api_faults using the deprecated parameter' do
is_expected.to contain_nova_config('notifications/notify_on_api_faults').with_value('true')
end
end
context 'with kombu_reconnect_delay set to 5.0' do
let :params do
{ :kombu_reconnect_delay => '5.0' }