Add region_name and interface for gnocchi collector
Change-Id: I0b07655a1ed4b0fd305fa58f338335871db66e3f
This commit is contained in:
@@ -44,6 +44,14 @@
|
||||
# (optional) Config Section from which to load plugin specific options
|
||||
# Default to 'keystone_authtoken'.
|
||||
#
|
||||
# [*region_name*]
|
||||
# (optional) Region name for gnocchi collector
|
||||
# Default to $::os_service_default
|
||||
#
|
||||
# [*interface*]
|
||||
# (optional) Endpoint URL type
|
||||
# Default to $::os_service_default
|
||||
#
|
||||
class cloudkitty::processor (
|
||||
$package_ensure = 'present',
|
||||
$manage_service = true,
|
||||
@@ -55,6 +63,8 @@ class cloudkitty::processor (
|
||||
$services = $::os_service_default,
|
||||
$auth_type = 'password',
|
||||
$auth_section = 'keystone_authtoken',
|
||||
$region_name = $::os_service_default,
|
||||
$interface = $::os_service_default,
|
||||
) {
|
||||
|
||||
include cloudkitty::deps
|
||||
@@ -98,7 +108,9 @@ class cloudkitty::processor (
|
||||
cloudkitty_config {
|
||||
'collect/collector': value => $collector;
|
||||
'collector_gnocchi/auth_type': value => $auth_type;
|
||||
'collector_gnocchi/auth_section': value => $auth_section
|
||||
'collector_gnocchi/auth_section': value => $auth_section;
|
||||
'collector_gnocchi/region_name': value => $region_name;
|
||||
'collector_gnocchi/interface': value => $interface;
|
||||
}
|
||||
|
||||
}
|
||||
|
@@ -0,0 +1,4 @@
|
||||
---
|
||||
features:
|
||||
- |
|
||||
Add parameters region_name and interface for gnocchi collector.
|
@@ -8,7 +8,9 @@ describe 'cloudkitty::processor' do
|
||||
:collector => 'gnocchi',
|
||||
:period => '60',
|
||||
:wait_periods => '1',
|
||||
:window => '3600',}
|
||||
:window => '3600',
|
||||
:region_name => 'RegionOne',
|
||||
:interface => 'publicURL',}
|
||||
end
|
||||
|
||||
shared_examples_for 'cloudkitty-processor' do
|
||||
@@ -23,6 +25,8 @@ describe 'cloudkitty::processor' do
|
||||
it { is_expected.to contain_cloudkitty_config('collect/wait_periods').with_value( params[:wait_periods] ) }
|
||||
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 { is_expected.to contain_cloudkitty_config('collector_gnocchi/region_name').with_value( params[:region_name] ) }
|
||||
it { is_expected.to contain_cloudkitty_config('collector_gnocchi/interface').with_value( params[:interface] ) }
|
||||
|
||||
it 'installs cloudkitty-processor package' do
|
||||
is_expected.to contain_package('cloudkitty-processor').with(
|
||||
|
Reference in New Issue
Block a user