Merge "Add cloudkitty::storage_version"

This commit is contained in:
Zuul 2019-02-14 00:48:30 +00:00 committed by Gerrit Code Review
commit fa9485bd6b
4 changed files with 19 additions and 0 deletions

View File

@ -226,6 +226,10 @@
# (Optional) Name of the storage backend driver.
# Defaults to $::os_service_default.
#
# [*storage_version*]
# (Optional) Version of the storage backend to use.
# Defaults to $::os_service_default
#
# [*tenant_fetcher_backend*]
# (Optional) Driver used to fetch tenant list.
# Defaults to $::os_service_default.
@ -284,6 +288,7 @@ class cloudkitty(
$output_basepath = $::os_service_default,
$pipeline = $::os_service_default,
$storage_backend = $::os_service_default,
$storage_version = $::os_service_default,
$tenant_fetcher_backend = $::os_service_default,
$auth_section = 'keystone_authtoken',
$keystone_version = '3',
@ -369,6 +374,7 @@ class cloudkitty(
cloudkitty_config {
'storage/backend': value => $storage_backend;
'storage/version': value => $storage_version;
'tenant_fetcher/backend': value => $tenant_fetcher_backend;
}

View File

@ -0,0 +1,5 @@
---
features:
- |
Added cloudkitty::storage_version that can be used to set the version of
the storage backend.

View File

@ -41,6 +41,11 @@ describe 'basic cloudkitty' do
}
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',

View File

@ -31,6 +31,7 @@ describe 'cloudkitty' do
is_expected.to contain_cloudkitty_config('oslo_messaging_notifications/transport_url').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cloudkitty_config('oslo_messaging_notifications/driver').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cloudkitty_config('storage/backend').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cloudkitty_config('storage/version').with_value('<SERVICE DEFAULT>')
end
it 'passes purge to resource' do
@ -54,6 +55,7 @@ describe 'cloudkitty' do
:rpc_response_timeout => '120',
:control_exchange => 'cloudkitty',
:storage_backend => 'gnocchi',
:storage_version => '1',
:auth_section => 'keystone_authtoken',
:keystone_version => '3',
}
@ -71,6 +73,7 @@ describe 'cloudkitty' do
it 'configures various things' do
is_expected.to contain_cloudkitty_config('oslo_messaging_notifications/topics').with_value('openstack')
is_expected.to contain_cloudkitty_config('storage/backend').with_value('gnocchi')
is_expected.to contain_cloudkitty_config('storage/version').with_value('1')
is_expected.to contain_cloudkitty_config('keystone_fetcher/auth_section').with_value('keystone_authtoken')
is_expected.to contain_cloudkitty_config('keystone_fetcher/keystone_version').with_value('3')
end