From 161894b0d5a2a0c655f1cdccee7d17350a691c2a Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Wed, 17 Aug 2022 13:29:35 +0900
Subject: [PATCH] Ubuntu/Debian: Enable deployment in acceptance tests

... because cloudkitty packages are already available in these
operating systems.

Change-Id: Ieae898cd718377d7ad0494cd5051651ed90dcdd2
---
 spec/acceptance/10_basic_cloudkitty_spec.rb | 80 +++++++++------------
 1 file changed, 35 insertions(+), 45 deletions(-)

diff --git a/spec/acceptance/10_basic_cloudkitty_spec.rb b/spec/acceptance/10_basic_cloudkitty_spec.rb
index 156e80a..f07a02f 100644
--- a/spec/acceptance/10_basic_cloudkitty_spec.rb
+++ b/spec/acceptance/10_basic_cloudkitty_spec.rb
@@ -29,48 +29,40 @@ describe 'basic cloudkitty' do
       }
 
       # Cloudkitty resources
-      case $::osfamily {
-        'Debian': {
-          warning('Cloudkitty is not yet packaged on Debian systems.')
-        }
-        'RedHat': {
-          class { 'cloudkitty::db':
-            database_connection => 'mysql+pymysql://cloudkitty:a_big_secret@127.0.0.1/cloudkitty?charset=utf8',
-          }
-          class { 'cloudkitty::logging':
-            debug => true,
-          }
-          class { 'cloudkitty':
-            default_transport_url => 'rabbit://cloudkitty:an_even_bigger_secret@127.0.0.1:5672',
-            # NOTE(tobias-urdin): Cloudkitty in Stein has moved to storage v2 by default and the
-            # only driver available is InfluxDB which we do not deploy. This sets it back to the
-            # old sqlalchemy storage driver in version 1.
-            storage_backend       => 'sqlalchemy',
-            storage_version       => '1',
-          }
-          class { 'cloudkitty::keystone::auth':
-            password => 'a_big_secret',
-          }
-          class { 'cloudkitty::keystone::authtoken':
-            password  => 'a_big_secret',
-          }
-          class { 'cloudkitty::db::mysql':
-            password => 'a_big_secret',
-          }
-          class { 'cloudkitty::api':
-            service_name => 'httpd',
-          }
-          include apache
-          class { 'cloudkitty::wsgi::apache':
-            ssl => false,
-          }
-          class { 'cloudkitty::processor': }
-          class { 'cloudkitty::client': }
-        }
-        default: {
-          fail("Unsupported osfamily (${::osfamily})")
-        }
+      class { 'cloudkitty::db':
+        database_connection => 'mysql+pymysql://cloudkitty:a_big_secret@127.0.0.1/cloudkitty?charset=utf8',
       }
+      class { 'cloudkitty::logging':
+        debug => true,
+      }
+      class { 'cloudkitty':
+        default_transport_url => 'rabbit://cloudkitty:an_even_bigger_secret@127.0.0.1:5672',
+        # NOTE(tobias-urdin): Cloudkitty in Stein has moved to storage v2 by default and the
+        # only driver available is InfluxDB which we do not deploy. This sets it back to the
+        # old sqlalchemy storage driver in version 1.
+        storage_backend       => 'sqlalchemy',
+        storage_version       => '1',
+      }
+      class { 'cloudkitty::keystone::auth':
+        password => 'a_big_secret',
+      }
+      class { 'cloudkitty::keystone::authtoken':
+        password  => 'a_big_secret',
+      }
+      class { 'cloudkitty::db::mysql':
+        charset  => $::openstack_integration::params::mysql_charset,
+        collate  => $::openstack_integration::params::mysql_collate,
+        password => 'a_big_secret',
+      }
+      class { 'cloudkitty::api':
+        service_name => 'httpd',
+      }
+      include apache
+      class { 'cloudkitty::wsgi::apache':
+        ssl => false,
+      }
+      class { 'cloudkitty::processor': }
+      class { 'cloudkitty::client': }
       EOS
 
 
@@ -79,10 +71,8 @@ describe 'basic cloudkitty' do
       apply_manifest(pp, :catch_changes => true)
     end
 
-    if os[:family].casecmp('RedHat') == 0
-      describe port(8889) do
-        it { is_expected.to be_listening }
-      end
+    describe port(8889) do
+      it { is_expected.to be_listening }
     end
 
   end