Disable legacy ceilometer api by default

Ceilometer api is deprectaed in Ocata. Lets disable by default.
This can still be enabled by setting enable_legacy_ceilometer_api
param.

Change-Id: Iffb8c2cfed53d8b29e777c35cee44921194239e9
This commit is contained in:
Pradeep Kilambi
2016-12-09 11:31:11 -05:00
parent 9fcf8ac9ff
commit bb317aac01
2 changed files with 20 additions and 3 deletions

View File

@@ -18,6 +18,10 @@
#
# === Parameters
#
# [*enable_legacy_api*]
# (Optional) Enable legacy ceilometer api service.
# Defaults to hiera('enable_legacy_api', false)
#
# [*ceilometer_network*]
# (Optional) The network name where the ceilometer endpoint is listening on.
# This is set by t-h-t.
@@ -53,6 +57,7 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::ceilometer::api (
$enable_legacy_api = hiera('enable_legacy_ceilometer_api', false),
$ceilometer_network = hiera('ceilometer_api_network', undef),
$certificates_specs = hiera('apache_certificates_specs', {}),
$enable_internal_tls = hiera('enable_internal_tls', false),
@@ -76,7 +81,7 @@ class tripleo::profile::base::ceilometer::api (
$tls_keyfile = undef
}
if $step >= 4 {
if $step >= 4 and $enable_legacy_api {
include ::ceilometer::api
class { '::ceilometer::wsgi::apache':
ssl_cert => $tls_certfile,

View File

@@ -32,9 +32,10 @@ describe 'tripleo::profile::base::ceilometer::api' do
end
end
context 'with step 4' do
context 'with step 4 and enable_legacy_api' do
let(:params) { {
:step => 4,
:step => 4,
:enable_legacy_api => true,
} }
it 'should trigger complete configuration' do
@@ -42,6 +43,17 @@ describe 'tripleo::profile::base::ceilometer::api' do
is_expected.to contain_class('ceilometer::wsgi::apache')
end
end
context 'with step 4 and default enable_legacy_api' do
let(:params) { {
:step => 4,
} }
it 'should do nothing' do
is_expected.to_not contain_class('ceilometer::api')
is_expected.to_not contain_class('ceilometer::wsgi::apache')
end
end
end