diff --git a/manifests/init.pp b/manifests/init.pp index d6d8b44b5..7343d09c9 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -381,14 +381,6 @@ # (optional) The strategy to use for auth: noauth or keystone. # Defaults to undef # -# [*upgrade_level_cells*] -# (optional) Sets a version cap for messages sent to local cells services -# Defaults to undef -# -# [*upgrade_level_intercell*] -# (optional) Sets a version cap for messages sent between cells services -# Defaults to undef -# # [*periodic_interval*] # (optional) Seconds between running periodic tasks. # Defaults to undef @@ -474,8 +466,6 @@ class nova( $instance_name_template = $facts['os_service_default'], # DEPRECATED PARAMETERS $auth_strategy = undef, - $upgrade_level_cells = undef, - $upgrade_level_intercell = undef, $periodic_interval = undef, ) inherits nova::params { @@ -486,12 +476,6 @@ class nova( warning('enabled_ssl_apis is empty but use_ssl is set to true') } - [ 'upgrade_level_cells', 'upgrade_level_intercell' ].each |String $ug_cell_opt| { - if getvar($ug_cell_opt) != undef { - warning("The ${ug_cell_opt} is deprecated and has no effect.") - } - } - if $periodic_interval != undef { warning('The periodic_interval parameter is deprecated and has no effect.') } @@ -702,9 +686,4 @@ but should be one of: ssh-rsa, ssh-dsa, ssh-ecdsa, ssh-ed25519.") 'upgrade_levels/conductor': value => $upgrade_level_conductor; 'upgrade_levels/scheduler': value => $upgrade_level_scheduler; } - - nova_config { - 'upgrade_levels/cells': ensure => absent; - 'upgrade_levels/intercell': ensure => absent; - } } diff --git a/releasenotes/notes/remove-cells-v2-upgrade-leve-opts-2bdb145cd56d0632.yaml b/releasenotes/notes/remove-cells-v2-upgrade-leve-opts-2bdb145cd56d0632.yaml new file mode 100644 index 000000000..a10b4665f --- /dev/null +++ b/releasenotes/notes/remove-cells-v2-upgrade-leve-opts-2bdb145cd56d0632.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + The ``nova::upgrade_level_cells`` parameter and + the ``nova::upgrade_level_intercell`` parameter have been removed. diff --git a/spec/classes/nova_init_spec.rb b/spec/classes/nova_init_spec.rb index 5ed4fc895..855e3b10d 100644 --- a/spec/classes/nova_init_spec.rb +++ b/spec/classes/nova_init_spec.rb @@ -245,9 +245,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/scheduler').with_value('1.0.0') - - is_expected.to contain_nova_config('upgrade_levels/cells').with_ensure('absent') - is_expected.to contain_nova_config('upgrade_levels/intercell').with_ensure('absent') end it 'configures various things' do