Enable cloudkitty
Depends-on: https://review.opendev.org/957429 Change-Id: Ib4972776ae6b87906681d0a06c65add887020e55 Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
@@ -73,6 +73,7 @@ scenario](#all-in-one).
|
|||||||
| ceph rgw | | | | X | | |
|
| ceph rgw | | | | X | | |
|
||||||
| vitrage | X | | | | | |
|
| vitrage | X | | | | | |
|
||||||
| watcher | X | | | | | |
|
| watcher | X | | | | | |
|
||||||
|
| cloudkitty | X | | | | | |
|
||||||
| vpnaas | | | | X | X | |
|
| vpnaas | | | | X | X | |
|
||||||
| taas | | | | X | | |
|
| taas | | | | X | | |
|
||||||
| bgpvpn-api | | | | X | | |
|
| bgpvpn-api | | | | X | | |
|
||||||
|
|||||||
@@ -102,10 +102,12 @@ class { 'openstack_integration::gnocchi':
|
|||||||
}
|
}
|
||||||
|
|
||||||
include openstack_integration::watcher
|
include openstack_integration::watcher
|
||||||
|
include openstack_integration::cloudkitty
|
||||||
|
|
||||||
class { 'openstack_integration::tempest':
|
class { 'openstack_integration::tempest':
|
||||||
cinder => true,
|
cinder => true,
|
||||||
cinder_backup => true,
|
cinder_backup => true,
|
||||||
|
cloudkitty => true,
|
||||||
gnocchi => true,
|
gnocchi => true,
|
||||||
ceilometer => true,
|
ceilometer => true,
|
||||||
aodh => true,
|
aodh => true,
|
||||||
|
|||||||
110
manifests/cloudkitty.pp
Normal file
110
manifests/cloudkitty.pp
Normal file
@@ -0,0 +1,110 @@
|
|||||||
|
# Configure the cloudkitty service
|
||||||
|
#
|
||||||
|
class openstack_integration::cloudkitty (
|
||||||
|
) {
|
||||||
|
|
||||||
|
include openstack_integration::config
|
||||||
|
include openstack_integration::params
|
||||||
|
|
||||||
|
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,
|
||||||
|
}
|
||||||
|
|
||||||
|
class { 'cloudkitty':
|
||||||
|
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',
|
||||||
|
}),
|
||||||
|
notification_transport_url => os_transport_url({
|
||||||
|
'transport' => $::openstack_integration::config::messaging_notify_proto,
|
||||||
|
'host' => $::openstack_integration::config::host,
|
||||||
|
'port' => $::openstack_integration::config::messaging_notify_port,
|
||||||
|
'username' => 'cinder',
|
||||||
|
'password' => 'an_even_bigger_secret',
|
||||||
|
}),
|
||||||
|
rabbit_use_ssl => $::openstack_integration::config::ssl,
|
||||||
|
notification_driver => 'messagingv2',
|
||||||
|
# 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': }
|
||||||
|
}
|
||||||
@@ -24,6 +24,10 @@
|
|||||||
# (optional) Define if Cinder Backup needs to be tested.
|
# (optional) Define if Cinder Backup needs to be tested.
|
||||||
# Default to false.
|
# Default to false.
|
||||||
#
|
#
|
||||||
|
# [*cloudkitty*]
|
||||||
|
# (optional) Define if Cloudkitty needs to be tested.
|
||||||
|
# Default to false.
|
||||||
|
#
|
||||||
# [*designate*]
|
# [*designate*]
|
||||||
# (optional) Define if Designate needs to be tested.
|
# (optional) Define if Designate needs to be tested.
|
||||||
# Default to false.
|
# Default to false.
|
||||||
@@ -154,6 +158,7 @@ class openstack_integration::tempest (
|
|||||||
$ceilometer = false,
|
$ceilometer = false,
|
||||||
$cinder = false,
|
$cinder = false,
|
||||||
$cinder_backup = false,
|
$cinder_backup = false,
|
||||||
|
$cloudkitty = false,
|
||||||
$designate = false,
|
$designate = false,
|
||||||
$glance = true,
|
$glance = true,
|
||||||
$gnocchi = false,
|
$gnocchi = false,
|
||||||
@@ -308,6 +313,7 @@ class openstack_integration::tempest (
|
|||||||
image_name_alt => 'cirros_alt',
|
image_name_alt => 'cirros_alt',
|
||||||
cinder_available => $cinder,
|
cinder_available => $cinder,
|
||||||
cinder_backup_available => $cinder_backup,
|
cinder_backup_available => $cinder_backup,
|
||||||
|
cloudkitty_available => $cloudkitty,
|
||||||
designate_available => $designate,
|
designate_available => $designate,
|
||||||
glance_available => $glance,
|
glance_available => $glance,
|
||||||
horizon_available => $horizon,
|
horizon_available => $horizon,
|
||||||
|
|||||||
@@ -346,6 +346,9 @@ echo 'barbican_tempest_plugin.tests.scenario.test_image_signing.ImageSigningTest
|
|||||||
echo 'manila_tempest_tests.tests.api.test_shares.SharesCephFSTest.test_create_get_delete_share' >> /tmp/openstack/tempest/test-include-list.txt
|
echo 'manila_tempest_tests.tests.api.test_shares.SharesCephFSTest.test_create_get_delete_share' >> /tmp/openstack/tempest/test-include-list.txt
|
||||||
echo 'manila_tempest_tests.tests.api.test_shares.SharesNFSTest.test_create_get_delete_share' >> /tmp/openstack/tempest/test-include-list.txt
|
echo 'manila_tempest_tests.tests.api.test_shares.SharesNFSTest.test_create_get_delete_share' >> /tmp/openstack/tempest/test-include-list.txt
|
||||||
|
|
||||||
|
# Cloudkitty
|
||||||
|
echo 'cloudkitty_tempest_plugin.tests.api.v1' >> /tmp/openstack/tempest/test-include-list.txt
|
||||||
|
|
||||||
# NOTE(tkajinam): Disable AccountQuotaTest, because test_overlimit_upload consistently fails with rgw
|
# NOTE(tkajinam): Disable AccountQuotaTest, because test_overlimit_upload consistently fails with rgw
|
||||||
EXCLUDES="--exclude-regex=^tempest.api.object_storage.test_account_quotas.AccountQuotasTest"
|
EXCLUDES="--exclude-regex=^tempest.api.object_storage.test_account_quotas.AccountQuotasTest"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user