Remove deprecated client class
It was deprecated during 2023.2 cycle[1].
[1] f271472b48
Change-Id: Ifb3cf39088983848e49c4625d9182958a1db4f7e
This commit is contained in:
@@ -1,32 +0,0 @@
|
|||||||
# == Class: keystone::client
|
|
||||||
#
|
|
||||||
# Installs Keystone client.
|
|
||||||
#
|
|
||||||
# === Parameters
|
|
||||||
#
|
|
||||||
# [*client_package_name*]
|
|
||||||
# (optional) The name of python keystone client package
|
|
||||||
# Defaults to $keystone::params::client_package_name
|
|
||||||
#
|
|
||||||
# [*ensure*]
|
|
||||||
# (optional) Ensure state of the package.
|
|
||||||
# Defaults to 'present'.
|
|
||||||
#
|
|
||||||
class keystone::client (
|
|
||||||
$client_package_name = $keystone::params::client_package_name,
|
|
||||||
$ensure = 'present'
|
|
||||||
) inherits keystone::params {
|
|
||||||
|
|
||||||
include keystone::deps
|
|
||||||
|
|
||||||
warning("The keystone::client class has been deprecated and will be removed \
|
|
||||||
in a future release.")
|
|
||||||
|
|
||||||
package { 'python-keystoneclient':
|
|
||||||
ensure => $ensure,
|
|
||||||
name => $client_package_name,
|
|
||||||
tag => 'openstack',
|
|
||||||
}
|
|
||||||
|
|
||||||
include openstacklib::openstackclient
|
|
||||||
}
|
|
||||||
@@ -364,11 +364,6 @@
|
|||||||
#
|
#
|
||||||
# DEPRECATED PARAMETERS
|
# DEPRECATED PARAMETERS
|
||||||
#
|
#
|
||||||
# [*client_package_ensure*]
|
|
||||||
# (Optional) Desired ensure state of the client package.
|
|
||||||
# accepts latest or specific versions.
|
|
||||||
# Defaults to present.
|
|
||||||
#
|
|
||||||
# [*catalog_template_file*]
|
# [*catalog_template_file*]
|
||||||
# (Optional) Path to the catalog used if 'templated' catalog driver is used.
|
# (Optional) Path to the catalog used if 'templated' catalog driver is used.
|
||||||
# Defaults to '/etc/keystone/default_catalog.templates'
|
# Defaults to '/etc/keystone/default_catalog.templates'
|
||||||
@@ -448,7 +443,6 @@ class keystone(
|
|||||||
Boolean $purge_config = false,
|
Boolean $purge_config = false,
|
||||||
$amqp_durable_queues = $facts['os_service_default'],
|
$amqp_durable_queues = $facts['os_service_default'],
|
||||||
# DEPRECATED PARAMETERS
|
# DEPRECATED PARAMETERS
|
||||||
$client_package_ensure = undef,
|
|
||||||
$catalog_template_file = undef,
|
$catalog_template_file = undef,
|
||||||
) inherits keystone::params {
|
) inherits keystone::params {
|
||||||
|
|
||||||
@@ -456,10 +450,6 @@ class keystone(
|
|||||||
include keystone::logging
|
include keystone::logging
|
||||||
include keystone::policy
|
include keystone::policy
|
||||||
|
|
||||||
if $client_package_ensure != undef {
|
|
||||||
warning('The client_package_ensure parameter is deprecated and has no effect.')
|
|
||||||
}
|
|
||||||
|
|
||||||
if $catalog_template_file != undef {
|
if $catalog_template_file != undef {
|
||||||
warning('The catalog_template_file parameter is deprecated and will be removed in a future release')
|
warning('The catalog_template_file parameter is deprecated and will be removed in a future release')
|
||||||
$catalog_template_file_real = $catalog_template_file
|
$catalog_template_file_real = $catalog_template_file
|
||||||
|
|||||||
7
releasenotes/notes/remove-client-0218cc0d0e859003.yaml
Normal file
7
releasenotes/notes/remove-client-0218cc0d0e859003.yaml
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
The ``keystone::client`` class has been removed.
|
||||||
|
|
||||||
|
- |
|
||||||
|
The ``keystone::client_package_ensure`` parameter has been removed.
|
||||||
@@ -1,56 +0,0 @@
|
|||||||
require 'spec_helper'
|
|
||||||
|
|
||||||
describe 'keystone::client' do
|
|
||||||
shared_examples 'keystone::client' do
|
|
||||||
|
|
||||||
it { is_expected.to contain_class('keystone::deps') }
|
|
||||||
|
|
||||||
context 'with default parameters' do
|
|
||||||
it { should contain_package('python-keystoneclient').with(
|
|
||||||
:ensure => 'present',
|
|
||||||
:name => platform_params[:client_package_name],
|
|
||||||
:tag => 'openstack',
|
|
||||||
)}
|
|
||||||
|
|
||||||
it { should contain_class('openstacklib::openstackclient') }
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'with specified parameters' do
|
|
||||||
let :params do
|
|
||||||
{
|
|
||||||
:client_package_name => 'package_name',
|
|
||||||
:ensure => '1.2.3',
|
|
||||||
}
|
|
||||||
end
|
|
||||||
|
|
||||||
it { should contain_package('python-keystoneclient').with(
|
|
||||||
:ensure => '1.2.3',
|
|
||||||
:name => 'package_name',
|
|
||||||
:tag => 'openstack',
|
|
||||||
)}
|
|
||||||
|
|
||||||
it { should contain_class('openstacklib::openstackclient') }
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
on_supported_os({
|
|
||||||
:supported_os => OSDefaults.get_supported_os
|
|
||||||
}).each do |os,facts|
|
|
||||||
context "on #{os}" do
|
|
||||||
let (:facts) do
|
|
||||||
facts.merge!(OSDefaults.get_facts())
|
|
||||||
end
|
|
||||||
|
|
||||||
let (:platform_params) do
|
|
||||||
case facts[:os]['family']
|
|
||||||
when 'Debian'
|
|
||||||
{ :client_package_name => 'python3-keystoneclient' }
|
|
||||||
when 'RedHat'
|
|
||||||
{ :client_package_name => 'python3-keystoneclient' }
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
it_behaves_like 'keystone::client'
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
Reference in New Issue
Block a user