diff --git a/manifests/ldap.pp b/manifests/ldap.pp index 355487b43..11620bfad 100644 --- a/manifests/ldap.pp +++ b/manifests/ldap.pp @@ -473,8 +473,7 @@ class keystone::ldap( include ::keystone::deps if $manage_packages { - $ldap_packages = ['python-ldap', 'python-ldappool'] - ensure_resource('package', $ldap_packages, { ensure => $package_ensure, + ensure_resource('package', 'python-ldappool', { ensure => $package_ensure, tag => 'keystone-package' }) } diff --git a/manifests/ldap_backend.pp b/manifests/ldap_backend.pp index 9314b9320..7811f5629 100644 --- a/manifests/ldap_backend.pp +++ b/manifests/ldap_backend.pp @@ -500,8 +500,7 @@ and \"${domain_dir_enabled}\" for identity/domain_config_dir" $domain = $name if $manage_packages { - $ldap_packages = ['python-ldap', 'python-ldappool'] - ensure_resource('package', $ldap_packages, { + ensure_resource('package', 'python-ldappool', { ensure => $package_ensure, tag => ['openstack', 'keystone-package'], }) diff --git a/releasenotes/notes/fix_ldap_packages-3dd59f5bfa5a5bc0.yaml b/releasenotes/notes/fix_ldap_packages-3dd59f5bfa5a5bc0.yaml new file mode 100644 index 000000000..24521f9e8 --- /dev/null +++ b/releasenotes/notes/fix_ldap_packages-3dd59f5bfa5a5bc0.yaml @@ -0,0 +1,3 @@ +--- +fixes: + - issue with python-ldappool and python-ldap uninstalling each other each run. diff --git a/spec/classes/keystone_ldap_spec.rb b/spec/classes/keystone_ldap_spec.rb index 4d15d4ae7..7b6639c4d 100644 --- a/spec/classes/keystone_ldap_spec.rb +++ b/spec/classes/keystone_ldap_spec.rb @@ -79,7 +79,6 @@ describe 'keystone::ldap' do :auth_pool_connection_lifetime => 200, } end - it { is_expected.to contain_package('python-ldap') } it { is_expected.to contain_package('python-ldappool') } it 'should have basic params' do # basic params @@ -180,7 +179,6 @@ describe 'keystone::ldap' do let :params do { :manage_packages => false } end - it { is_expected.to_not contain_package('python-ldap') } it { is_expected.to_not contain_package('python-ldappool') } end diff --git a/spec/defines/keystone_ldap_backend_spec.rb b/spec/defines/keystone_ldap_backend_spec.rb index b2c466286..7c08ea17d 100644 --- a/spec/defines/keystone_ldap_backend_spec.rb +++ b/spec/defines/keystone_ldap_backend_spec.rb @@ -100,7 +100,6 @@ describe 'keystone::ldap_backend' do :auth_pool_connection_lifetime => 200, } end - it { is_expected.to contain_package('python-ldap') } it { is_expected.to contain_package('python-ldappool') } it 'should have basic params' do # basic params