summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPradeep Kilambi <pkilambi@redhat.com>2017-01-13 12:13:07 -0500
committerPradeep Kilambi <pkilambi@redhat.com>2017-01-18 10:29:22 -0500
commitcdeefea9061c1f6eac59e7e5e73238d10a91b01c (patch)
treec4aedbcc1add0aa4bee2d43f13e7e282ca837696
parent5acb133b7f1ec727d544362a4901f7abd05550a9 (diff)
Remove legacy flag and use composable interface
We dont need this flag anymore as we will disable api using composable interface instead. See I67900f7e6816212831aea8ed18f323652857fbd3 Closes-bug: #1656364 Change-Id: Ib6aea02bde6ad7e5223336579f0a99d6cd3ee98f
-rw-r--r--manifests/profile/base/ceilometer/api.pp7
-rw-r--r--spec/classes/tripleo_profile_base_ceilometer_api_spec.rb16
2 files changed, 3 insertions, 20 deletions
diff --git a/manifests/profile/base/ceilometer/api.pp b/manifests/profile/base/ceilometer/api.pp
index 2e7986b..6ef4748 100644
--- a/manifests/profile/base/ceilometer/api.pp
+++ b/manifests/profile/base/ceilometer/api.pp
@@ -18,10 +18,6 @@
#
# === 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.
@@ -57,7 +53,6 @@
# 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),
@@ -81,7 +76,7 @@ class tripleo::profile::base::ceilometer::api (
$tls_keyfile = undef
}
- if $step >= 4 and $enable_legacy_api {
+ if $step >= 4 {
include ::ceilometer::api
class { '::ceilometer::wsgi::apache':
ssl_cert => $tls_certfile,
diff --git a/spec/classes/tripleo_profile_base_ceilometer_api_spec.rb b/spec/classes/tripleo_profile_base_ceilometer_api_spec.rb
index 2887d32..acc9b51 100644
--- a/spec/classes/tripleo_profile_base_ceilometer_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_ceilometer_api_spec.rb
@@ -32,10 +32,9 @@ describe 'tripleo::profile::base::ceilometer::api' do
end
end
- context 'with step 4 and enable_legacy_api' do
+ context 'with step 4' do
let(:params) { {
- :step => 4,
- :enable_legacy_api => true,
+ :step => 4,
} }
it 'should trigger complete configuration' do
@@ -43,17 +42,6 @@ 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