Disable ceilometer API

Ceilometer API has been deprecated since Ocata. lets disable
it by default and add an env file to enable it if needed.

Closes-bug: #1676968

Change-Id: I571f5467466c29271e0235e8fde6bdae07c20daf

diff --git a/environments/services/ceilometer-api.yaml b/environments/services/ceilometer-api.yaml
new file mode 100644 (file)
index 0000000..1e37e73
--- /dev/null
+++ b/environments/services/ceilometer-api.yaml
@@ -0,0 +1,6 @@
+resource_registry:
+  OS::TripleO::Services::CeilometerApi: ../../puppet/services/ceilometer-api.yaml
+
+parameter_defaults:
+  CeilometerApiEndpoint: true
+

diff --git a/environments/services/disable-ceilometer-api.yaml b/environments/services/disable-ceilometer-api.yaml
deleted file mode 100644 (file)
index fb1ea6a..0000000
--- a/environments/services/disable-ceilometer-api.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-resource_registry:
-  OS::TripleO::Services::CeilometerApi: OS::Heat::None
-
-parameter_defaults:
-  CeilometerApiEndpoint: false

diff --git a/puppet/services/ceilometer-base.yaml b/puppet/services/ceilometer-base.yaml
index 185ffdc..e161372 100644 (file)
--- a/puppet/services/ceilometer-base.yaml
+++ b/puppet/services/ceilometer-base.yaml
@@ -77,7 +77,7 @@ parameters:
     description: Set rabbit subscriber port, change this if using SSL
     type: number
   CeilometerApiEndpoint:
-    default: true
+    default: false
     description: Whether to create or skip API endpoint. Set this to
         false, if you choose to disable Ceilometer API service.
     type: boolean

diff --git a/releasenotes/notes/disable-ceilo-api-dfe5d0947563bbe0.yaml b/releasenotes/notes/disable-ceilo-api-dfe5d0947563bbe0.yaml
new file mode 100644 (file)
index 0000000..2661f7c
--- /dev/null
+++ b/releasenotes/notes/disable-ceilo-api-dfe5d0947563bbe0.yaml
@@ -0,0 +1,4 @@
+---
+deprecations:
+  - Deprecate and disable ceilometer Api by default. This can be enabled
+    by passing in an env file to deploy command.

diff --git a/roles_data.yaml b/roles_data.yaml
index 130451f..01fb07a 100644 (file)
--- a/roles_data.yaml
+++ b/roles_data.yaml
@@ -82,7 +82,6 @@
     - OS::TripleO::Services::Snmp
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Timezone
-    - OS::TripleO::Services::CeilometerApi
     - OS::TripleO::Services::CeilometerCollector
     - OS::TripleO::Services::CeilometerExpirer
     - OS::TripleO::Services::CeilometerAgentCentral