From 1d34a8d18375942601f1d43da85f7628a1562bc9 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Sat, 16 Dec 2023 23:30:54 +0900
Subject: [PATCH] coordination: Remove support for etcd3 driver

... because the driver has been removed.

Depends-on: https://review.opendev.org/901040
Change-Id: I502c33d2fe80f3dac3c4ebe1653f99cc91a144b0
---
 manifests/coordination.pp              | 12 ----------
 manifests/params.pp                    |  2 --
 spec/defines/oslo_coordination_spec.rb | 32 --------------------------
 3 files changed, 46 deletions(-)

diff --git a/manifests/coordination.pp b/manifests/coordination.pp
index d048ffe..6606710 100644
--- a/manifests/coordination.pp
+++ b/manifests/coordination.pp
@@ -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,
diff --git a/manifests/params.pp b/manifests/params.pp
index 94ded56..971d43c 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -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: {
diff --git a/spec/defines/oslo_coordination_spec.rb b/spec/defines/oslo_coordination_spec.rb
index 69c3c75..f0ae203 100644
--- a/spec/defines/oslo_coordination_spec.rb
+++ b/spec/defines/oslo_coordination_spec.rb
@@ -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' }