openstack
/
puppet-nova
Code Issues Proposed changes

Merge "Deprecate the install_cinder_client parameter"

This commit is contained in:
Zuul 2021-03-16 04:48:20 +00:00 committed by Gerrit Code Review
parent f8b9cc0a6b 5ca156ee8d
commit 635b25ff91
4 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
manifests/api.pp
View File

@ -162,10 +162,6 @@
# (optional) Length of generated instance admin passwords (integer value)
# Defaults to $::os_service_default
#
# [*install_cinder_client*]
# (optional) Whether the cinder::client class should be used to install the cinder client.
# Defaults to true
#
# [*allow_resize_to_same_host*]
# (optional) Allow destination machine to match source for resize.
# Defaults to false
@ -178,6 +174,10 @@
# metadata handling from api class.
# Defaults to false
#
# [*install_cinder_client*]
# (optional) Whether the cinder::client class should be used to install the cinder client.
# Defaults to undef
#
class nova::api(
$enabled = true,
$manage_service = true,
@ -212,10 +212,10 @@ class nova::api(
$enable_network_quota = $::os_service_default,
$enable_instance_password = $::os_service_default,
$password_length = $::os_service_default,
$install_cinder_client = true,
$allow_resize_to_same_host = false,
# DEPRECATED PARAMETER
$nova_metadata_wsgi_enabled = false,
$install_cinder_client = undef,
) inherits nova::params {
include nova::deps
@ -229,9 +229,8 @@ class nova::api(
warning('Running nova metadata api via evenlet is deprecated and will be removed in Stein release.')
}
if $install_cinder_client {
include cinder::client
Class['cinder::client'] ~> Nova::Generic_service['api']
if $install_cinder_client != undef {
warning('The nova::api::install_cinder_client parameter is deprecated and has no effect')
}
if $instance_name_template {

4
metadata.json
View File

@ -9,10 +9,6 @@
"name": "joshuabaird/ipaclient",
"version_requirement": ">=2.5.1"
},
{
"name": "openstack/cinder",
"version_requirement": ">=18.3.0 <19.0.0"
},
{
"name": "puppetlabs/inifile",
"version_requirement": ">=2.0.0 <3.0.0"

5
releasenotes/notes/deprecate-install_cinder_client-9b5bc4f9f0ab416e.yaml Normal file
View File

@ -0,0 +1,5 @@
---
deprecations:
- |
The ``nova::api::install_cinder_client`` parameter has been deprecated and
has no effect. This parameter will be removed in a future release.

10
spec/classes/nova_api_spec.rb
View File

@ -19,7 +19,6 @@ describe 'nova::api' do
context 'with default parameters' do
it { is_expected.to contain_class('nova::keystone::authtoken') }
it { is_expected.to contain_class('cinder::client').that_notifies('Nova::Generic_service[api]') }
it 'installs nova-api package and service' do
is_expected.to contain_service('nova-api').with(
@ -301,15 +300,6 @@ describe 'nova::api' do
end
context 'when disabling cinder client installation' do
before do
params.merge!({ :install_cinder_client => false })
end
it { is_expected.to_not contain_class('cinder::client') }
end
context 'when service_name is not valid' do
before do
params.merge!({ :service_name => 'foobar' })