openstack
/
puppet-keystone
Code Issues Proposed changes

fix ldap packages for keystone backend 

When puppet runs it will try to install python-ldap and
python-ldappool. Each run will install one or the other
due to the other package settings telling the package
manager to uninstall it.

Change-Id: I13a0af479dcac45ff77685f5eccfb865f7dab0f5
Closes-Bug: #1709519
This commit is contained in:
Matthew J. Black 2017-08-09 12:13:59 -04:00
parent 19e4cfffe0
commit 8ba0d32d5b
5 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/ldap.pp
View File

@ -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' })
}

3
manifests/ldap_backend.pp
View File

@ -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'],
})

3
releasenotes/notes/fix_ldap_packages-3dd59f5bfa5a5bc0.yaml Normal file
View File

@ -0,0 +1,3 @@
---
fixes:
- issue with python-ldappool and python-ldap uninstalling each other each run.

2
spec/classes/keystone_ldap_spec.rb
View File

@ -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

1
spec/defines/keystone_ldap_backend_spec.rb
View File

@ -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