Deprecate python.pp and fix client tags
These classes essentially do the same thing, except client.pp didn't allow us to specify a specific package name and python.pp didn't tag the package. Additionally, keystone.pp installs openstackclient. Therefore I'm removing the functionality and deprecating python.pp and will see what happens in CI. Change-Id: I7f2243a902372e8f64127221316db7f98f94be61
This commit is contained in:
parent
d850c3e34b
commit
fc59810bd8
@ -4,16 +4,22 @@
|
||||
#
|
||||
# === 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 {
|
||||
|
||||
package { 'python-keystoneclient':
|
||||
ensure => $ensure,
|
||||
name => $client_package_name,
|
||||
tag => 'openstack',
|
||||
}
|
||||
|
||||
|
@ -17,9 +17,5 @@ class keystone::python (
|
||||
$ensure = 'present'
|
||||
) inherits keystone::params {
|
||||
|
||||
package { 'python-keystone' :
|
||||
ensure => $ensure,
|
||||
name => $client_package_name,
|
||||
}
|
||||
|
||||
warning('This class is deprecated, has no effect, and will be removed in Newton')
|
||||
}
|
||||
|
@ -1,17 +0,0 @@
|
||||
require 'spec_helper'
|
||||
|
||||
describe 'keystone::python' do
|
||||
|
||||
let :facts do
|
||||
@default_facts.merge({ :osfamily => 'Debian' })
|
||||
end
|
||||
|
||||
it { is_expected.to contain_package('python-keystone').with_ensure("present") }
|
||||
|
||||
describe 'override ensure' do
|
||||
let(:params) { { :ensure => "latest" } }
|
||||
|
||||
it { is_expected.to contain_package('python-keystone').with_ensure("latest") }
|
||||
end
|
||||
|
||||
end
|
Loading…
x
Reference in New Issue
Block a user