From cdeefea9061c1f6eac59e7e5e73238d10a91b01c Mon Sep 17 00:00:00 2001
From: Pradeep Kilambi <pkilambi@redhat.com>
Date: Fri, 13 Jan 2017 12:13:07 -0500
Subject: 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
---
 manifests/profile/base/ceilometer/api.pp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'manifests/profile/base/ceilometer')

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,
-- 
cgit 1.2.3-korg