openstack
/
puppet-oslo
Code Issues Proposed changes

coordination: Remove support for etcd3 driver 

... because the driver has been removed.

Depends-on: https://review.opendev.org/901040
Change-Id: I502c33d2fe80f3dac3c4ebe1653f99cc91a144b0
This commit is contained in:
Takashi Kajinami 2023-12-16 23:30:54 +09:00
parent 1d40ba5178
commit 1d34a8d183
3 changed files with 0 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/coordination.pp
View File

@ -45,18 +45,6 @@ define oslo::coordination (
tag => ['openstack'],
})
}
/^etcd3:\/\//: {
warning('Support for the etcd3 driver has been deprecated.')
if $::oslo::params::python_etcd3_package_name {
ensure_packages('python-etcd3', {
name => $::oslo::params::python_etcd3_package_name,
ensure => $package_ensure,
tag => ['openstack'],
})
} else {
warning('The python-etcd3 package is not available.')
}
}
/^memcached:\/\//: {
ensure_packages('python-pymemcache', {
name => $::oslo::params::python_pymemcache_package_name,

2
manifests/params.pp
View File

@ -13,7 +13,6 @@ class oslo::params {
$python_memcache_package_name = 'python3-memcached'
$python_redis_package_name = 'python3-redis'
$python_etcd3gw_package_name = 'python3-etcd3gw'
$python_etcd3_package_name = undef
$python_pymemcache_package_name = 'python3-pymemcache'
}
'Debian': {
@ -21,7 +20,6 @@ class oslo::params {
$python_memcache_package_name = 'python3-memcache'
$python_redis_package_name = 'python3-redis'
$python_etcd3gw_package_name = 'python3-etcd3gw'
$python_etcd3_package_name = 'python3-etcd3'
$python_pymemcache_package_name = 'python3-pymemcache'
}
default: {

32
spec/defines/oslo_coordination_spec.rb
View File

@ -40,38 +40,6 @@ describe 'oslo::coordination' do
end
end
context 'with etcd3 backend' do
let :params do
{ :backend_url => 'etcd3://localhost:2379' }
end
it 'configures etcd3gw backend' do
is_expected.to contain_keystone_config('coordination/backend_url').with_value('etcd3://localhost:2379').with_secret(true)
if platform_params[:python_etcd3_package_name]
is_expected.to contain_package('python-etcd3').with(
:name => platform_params[:python_etcd3_package_name],
:ensure => 'installed',
:tag => ['openstack'],
)
else
is_expected.to_not contain_package('python-etcd3')
end
end
context 'with backend package management disabled' do
before do
params.merge!({
:manage_backend_package => false,
})
end
it 'does not install backend package' do
is_expected.to_not contain_package('python-etcd3')
end
end
end
context 'with etcd3gw backend(http)' do
let :params do
{ :backend_url => 'etcd3+http://localhost:2379' }