summaryrefslogtreecommitdiffstats
path: root/manifests/profile/base
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-01-18 20:00:35 +0000
committerGerrit Code Review <review@openstack.org>2017-01-18 20:00:35 +0000
commit3b3699ac9929ab459eec4ff2ad978c438f5dfadb (patch)
tree22e338405b7d38232bb897044f04cab798f6f51c /manifests/profile/base
parentbf68fa9683ee30cc2ebdf624f47e82a4fcceb746 (diff)
parentcdeefea9061c1f6eac59e7e5e73238d10a91b01c (diff)
Merge "Remove legacy flag and use composable interface"
Diffstat (limited to 'manifests/profile/base')
-rw-r--r--manifests/profile/base/ceilometer/api.pp7
1 files changed, 1 insertions, 6 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,