Change configuration section names
In order to respect the convention [backendtype_backendname] for all collectors and storage backends in Cloudkitty configuration some sections names has changed. Related change in cloudkitty is: I3435a151de4b384f2f2540225504abe6c99b928e Change-Id: Icddac06e74c5601c2a09efc2db11d44fb4edc0b8
This commit is contained in:
@@ -391,8 +391,8 @@ class cloudkitty(
|
||||
}
|
||||
|
||||
cloudkitty_config {
|
||||
'keystone_fetcher/auth_section': value => $auth_section;
|
||||
'keystone_fetcher/keystone_version': value => $keystone_version;
|
||||
'fetcher_keystone/auth_section': value => $auth_section;
|
||||
'fetcher_keystone/keystone_version': value => $keystone_version;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -97,8 +97,8 @@ class cloudkitty::processor (
|
||||
|
||||
cloudkitty_config {
|
||||
'collect/collector': value => $collector;
|
||||
'gnocchi_collector/auth_type': value => $auth_type;
|
||||
'gnocchi_collector/auth_section': value => $auth_section
|
||||
'collector_gnocchi/auth_type': value => $auth_type;
|
||||
'collector_gnocchi/auth_section': value => $auth_section
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -77,8 +77,8 @@ describe 'cloudkitty' 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')
|
||||
is_expected.to contain_cloudkitty_config('fetcher_keystone/auth_section').with_value('keystone_authtoken')
|
||||
is_expected.to contain_cloudkitty_config('fetcher_keystone/keystone_version').with_value('3')
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
@@ -21,8 +21,8 @@ describe 'cloudkitty::processor' do
|
||||
it { is_expected.to contain_cloudkitty_config('collect/window').with_value( params[:window] ) }
|
||||
it { is_expected.to contain_cloudkitty_config('collect/period').with_value( params[:period] ) }
|
||||
it { is_expected.to contain_cloudkitty_config('collect/wait_periods').with_value( params[:wait_periods] ) }
|
||||
it { is_expected.to contain_cloudkitty_config('gnocchi_collector/auth_type').with_value('password') }
|
||||
it { is_expected.to contain_cloudkitty_config('gnocchi_collector/auth_section').with_value('keystone_authtoken') }
|
||||
it { is_expected.to contain_cloudkitty_config('collector_gnocchi/auth_type').with_value('password') }
|
||||
it { is_expected.to contain_cloudkitty_config('collector_gnocchi/auth_section').with_value('keystone_authtoken') }
|
||||
|
||||
it 'installs cloudkitty-processor package' do
|
||||
is_expected.to contain_package('cloudkitty-processor').with(
|
||||
|
||||
Reference in New Issue
Block a user