diff --git a/manifests/client.pp b/manifests/client.pp index cf668bfec..bd89cb304 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -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', } diff --git a/manifests/python.pp b/manifests/python.pp index 32adc63f4..a46a018e3 100644 --- a/manifests/python.pp +++ b/manifests/python.pp @@ -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') } diff --git a/spec/classes/keystone_python_spec.rb b/spec/classes/keystone_python_spec.rb deleted file mode 100644 index e65a13105..000000000 --- a/spec/classes/keystone_python_spec.rb +++ /dev/null @@ -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