Merge "Remove support for [upgrade_levels] network"
This commit is contained in:
commit
76f186c5fe
@ -370,10 +370,6 @@
|
||||
# (optional) Sets a version cap for messages sent to cert services
|
||||
# Defaults to undef
|
||||
#
|
||||
# [*upgrade_level_network*]
|
||||
# (optional) Sets a version cap for messages sent to network services
|
||||
# Defaults to $facts['os_service_default']
|
||||
#
|
||||
class nova(
|
||||
$ensure_package = 'present',
|
||||
$default_transport_url = $facts['os_service_default'],
|
||||
@ -453,7 +449,6 @@ class nova(
|
||||
# DEPRECATED PARAMETERS
|
||||
$auth_strategy = undef,
|
||||
$upgrade_level_cert = undef,
|
||||
$upgrade_level_network = undef,
|
||||
) inherits nova::params {
|
||||
|
||||
include nova::deps
|
||||
@ -471,11 +466,6 @@ class nova(
|
||||
in a future release.")
|
||||
}
|
||||
|
||||
if $upgrade_level_network != undef {
|
||||
warning("The upgrade_level_network parameter is deprecated and will be removed \
|
||||
in a future release.")
|
||||
}
|
||||
|
||||
if $use_ssl {
|
||||
if !$cert_file {
|
||||
fail('The cert_file parameter is required when use_ssl is set to true')
|
||||
@ -697,7 +687,6 @@ but should be one of: ssh-rsa, ssh-dsa, ssh-ecdsa.")
|
||||
'upgrade_levels/compute': value => $upgrade_level_compute;
|
||||
'upgrade_levels/conductor': value => $upgrade_level_conductor;
|
||||
'upgrade_levels/intercell': value => $upgrade_level_intercell;
|
||||
'upgrade_levels/network': value => pick($upgrade_level_network, $facts['os_service_default']);
|
||||
'upgrade_levels/scheduler': value => $upgrade_level_scheduler;
|
||||
}
|
||||
}
|
||||
|
@ -0,0 +1,4 @@
|
||||
---
|
||||
upgrade:
|
||||
- |
|
||||
The ``nova::upgrade_level_network`` parameter has been removed.
|
@ -150,7 +150,6 @@ describe 'nova' do
|
||||
:upgrade_level_compute => '1.0.0',
|
||||
:upgrade_level_conductor => '1.0.0',
|
||||
:upgrade_level_intercell => '1.0.0',
|
||||
:upgrade_level_network => '1.0.0',
|
||||
:upgrade_level_scheduler => '1.0.0',
|
||||
:purge_config => false,
|
||||
:my_ip => '192.0.2.1',
|
||||
@ -234,7 +233,6 @@ describe 'nova' do
|
||||
is_expected.to contain_nova_config('upgrade_levels/compute').with_value('1.0.0')
|
||||
is_expected.to contain_nova_config('upgrade_levels/conductor').with_value('1.0.0')
|
||||
is_expected.to contain_nova_config('upgrade_levels/intercell').with_value('1.0.0')
|
||||
is_expected.to contain_nova_config('upgrade_levels/network').with_value('1.0.0')
|
||||
is_expected.to contain_nova_config('upgrade_levels/scheduler').with_value('1.0.0')
|
||||
end
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user