From de68525efa1769e8e4badde7ee8ebb28c5412225 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Sat, 16 Aug 2025 04:28:54 +0900
Subject: [PATCH] Use p-o-i manifest in acceptance tests

Depends-on: https://review.opendev.org/941463
Change-Id: I8413d894acb8e3bf98647580371ad9bd67f74926
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
---
 spec/acceptance/10_basic_cloudkitty_spec.rb | 96 +--------------------
 1 file changed, 1 insertion(+), 95 deletions(-)

diff --git a/spec/acceptance/10_basic_cloudkitty_spec.rb b/spec/acceptance/10_basic_cloudkitty_spec.rb
index deff23c..ddc3f7c 100644
--- a/spec/acceptance/10_basic_cloudkitty_spec.rb
+++ b/spec/acceptance/10_basic_cloudkitty_spec.rb
@@ -14,103 +14,9 @@ describe 'basic cloudkitty' do
       include openstack_integration::mysql
       include openstack_integration::redis
       include openstack_integration::keystone
-
-      if $::openstack_integration::config::ssl {
-        openstack_integration::ssl_key { 'cloudkitty':
-          notify  => Service['httpd'],
-          require => Package['cloudkitty-common'],
-        }
-        Exec['update-ca-certificates'] ~> Service['httpd']
-      }
-
-      openstack_integration::mq_user { 'cloudkitty':
-        password => 'an_even_bigger_secret',
-        before   => Anchor['cloudkitty::service::begin'],
-      }
-
-      # Cloudkitty resources
-      class { 'cloudkitty::db':
-        database_connection => os_database_connection({
-          'dialect'  => 'mysql+pymysql',
-          'host'     => $::openstack_integration::config::ip_for_url,
-          'username' => 'cloudkitty',
-          'password' => 'cloudkitty',
-          'database' => 'cloudkitty',
-          'charset'  => 'utf8',
-          'extra'    => $::openstack_integration::config::db_extra,
-        }),
-      }
-      class { 'cloudkitty::logging':
-        debug => true,
-      }
-
-      $default_transport_url = os_transport_url({
-        'transport' => $::openstack_integration::config::messaging_default_proto,
-        'host'      => $::openstack_integration::config::host,
-        'port'      => $::openstack_integration::config::messaging_default_port,
-        'username'  => 'cloudkitty',
-        'password'  => 'an_even_bigger_secret',
-      })
-      class { 'cloudkitty':
-        default_transport_url => $default_transport_url,
-        # 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':
-        public_url   => "${::openstack_integration::config::base_url}:8889",
-        internal_url => "${::openstack_integration::config::base_url}:8889",
-        admin_url    => "${::openstack_integration::config::base_url}:8889",
-        roles        => ['admin', 'service'],
-        password     => 'a_big_secret',
-      }
-      class { 'cloudkitty::keystone::authtoken':
-        password                     => 'a_big_secret',
-        user_domain_name             => 'Default',
-        project_domain_name          => 'Default',
-        auth_url                     => $::openstack_integration::config::keystone_admin_uri,
-        www_authenticate_uri         => $::openstack_integration::config::keystone_auth_uri,
-        memcached_servers            => $::openstack_integration::config::memcached_servers,
-        service_token_roles_required => true,
-      }
-      class { 'cloudkitty::db::mysql':
-        charset  => $::openstack_integration::params::mysql_charset,
-        collate  => $::openstack_integration::params::mysql_collate,
-        password => 'cloudkitty',
-        host     => $::openstack_integration::config::host,
-      }
-      class { 'cloudkitty::api':
-        service_name => 'httpd',
-      }
-      include apache
-      class { 'cloudkitty::wsgi::apache':
-        bind_host => $::openstack_integration::config::host,
-        ssl_key   => "/etc/cloudkitty/ssl/private/${facts['networking']['fqdn']}.pem",
-        ssl_cert  => $::openstack_integration::params::cert_path,
-        ssl       => $::openstack_integration::config::ssl,
-        workers   => 2,
-      }
-      class { 'cloudkitty::processor': }
-      class { 'cloudkitty::orchestrator':
-        coordination_url => $::openstack_integration::config::tooz_url,
-        max_workers      => 2,
-        max_threads      => 4,
-      }
-      class { 'cloudkitty::fetcher::keystone':
-        auth_type           => 'password',
-        username            => 'cloudkitty',
-        password            => 'a_big_secret',
-        project_name        => 'services',
-        user_domain_name    => 'Default',
-        project_domain_name => 'Default',
-        auth_url            => $::openstack_integration::config::keystone_admin_uri,
-      }
-      class { 'cloudkitty::client': }
+      include openstack_integration::cloudkitty
       EOS
 
-
       # Run it twice and test for idempotency
       apply_manifest(pp, :catch_failures => true)
       apply_manifest(pp, :catch_changes => true)