From 8568de47d56d2726335226619fe321372e2d9e4d Mon Sep 17 00:00:00 2001
From: Pradeep Kilambi <pkilambi@redhat.com>
Date: Fri, 13 Jan 2017 12:15:29 -0500
Subject: Add a environment file to disable ceilo api

Use the standard composable interface to disable
ceilo api instead of using a separate flag.

Closes-bug: #1656364

Change-Id: I67900f7e6816212831aea8ed18f323652857fbd3
---
 capabilities-map.yaml                             | 10 ++++++++++
 environments/services/disable-ceilometer-api.yaml |  2 ++
 puppet/services/ceilometer-base.yaml              |  5 -----
 3 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 environments/services/disable-ceilometer-api.yaml

diff --git a/capabilities-map.yaml b/capabilities-map.yaml
index ae747621..f4dc80fa 100644
--- a/capabilities-map.yaml
+++ b/capabilities-map.yaml
@@ -160,6 +160,16 @@ topics:
             description: Deploy Mistral service
             requires:
               - overcloud-resource-registry-puppet.yaml
+      - title: Ceilometer Api
+        description:
+        environments:
+          - file: environments/services/disable-ceilometer-api.yaml
+            title: Ceilometer Api
+            description: Disable Ceilometer Api service. This service is
+              deprecated and will be removed in future releases. Please move
+              to using gnocchi/aodh/panko apis instead.
+            requires:
+              - overcloud-resource-registry-puppet.yaml
 
   # - title: Network Interface Configuration
   #   description:
diff --git a/environments/services/disable-ceilometer-api.yaml b/environments/services/disable-ceilometer-api.yaml
new file mode 100644
index 00000000..94cd8d5d
--- /dev/null
+++ b/environments/services/disable-ceilometer-api.yaml
@@ -0,0 +1,2 @@
+resource_registry:
+  OS::TripleO::Services::CeilometerApi: OS::Heat::None
diff --git a/puppet/services/ceilometer-base.yaml b/puppet/services/ceilometer-base.yaml
index 0528368e..541921d6 100644
--- a/puppet/services/ceilometer-base.yaml
+++ b/puppet/services/ceilometer-base.yaml
@@ -50,10 +50,6 @@ parameters:
     default: false
     description: Whether to store events in ceilometer.
     type: boolean
-  EnableLegacyCeilometerApi:
-    default: false
-    description: Enable legacy ceilometer Api service if needed.
-    type: boolean
   EventPipelinePublishers:
     default: ['notifier://?topic=alarm.all']
     description: A list of publishers to put in event_pipeline.yaml.
@@ -103,7 +99,6 @@ outputs:
               - '/ceilometer'
               - '?bind_address='
               - "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
-        enable_legacy_ceilometer_api: {get_param: EnableLegacyCeilometerApi}
         ceilometer_backend: {get_param: CeilometerBackend}
         ceilometer::metering_secret: {get_param: CeilometerMeteringSecret}
         # we include db_sync class in puppet-tripleo
-- 
cgit 1.2.3-korg