Deprecate Ceilometer Expirer

We dont need expirer unless we have collector and standard
storage enabled. Lets turn it off by default and make it
an optional service. In upgrade scenario, we will kill the
process and stop the expirer, unless explicitly enabled.

Change-Id: Icffb7d1bb2cf7bd61026be7d2dcfbd70cd3bcbda

diff --git a/ci/environments/scenario001-multinode.yaml b/ci/environments/scenario001-multinode.yaml
index eee6f1c..a5c85aa 100644 (file)
--- a/ci/environments/scenario001-multinode.yaml
+++ b/ci/environments/scenario001-multinode.yaml
@@ -63,7 +63,6 @@ parameter_defaults:
     - OS::TripleO::Services::AodhEvaluator
     - OS::TripleO::Services::AodhNotifier
     - OS::TripleO::Services::AodhListener
-    - OS::TripleO::Services::CeilometerExpirer
     - OS::TripleO::Services::CeilometerAgentCentral
     - OS::TripleO::Services::CeilometerAgentIpmi
     - OS::TripleO::Services::CeilometerAgentNotification

diff --git a/environments/services/ceilometer-expirer.yaml b/environments/services/ceilometer-expirer.yaml
new file mode 100644 (file)
index 0000000..d20ee25
--- /dev/null
+++ b/environments/services/ceilometer-expirer.yaml
@@ -0,0 +1,2 @@
+resource_registry:
+  OS::TripleO::Services::CeilometerExpirer: ../../puppet/services/ceilometer-expirer.yaml

diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index 0d55070..74776e7 100644 (file)
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -189,7 +189,7 @@ resource_registry:
   OS::TripleO::Services::Timezone: puppet/services/time/timezone.yaml
   OS::TripleO::Services::CeilometerApi: puppet/services/ceilometer-api.yaml
   OS::TripleO::Services::CeilometerCollector: puppet/services/disabled/ceilometer-collector.yaml
-  OS::TripleO::Services::CeilometerExpirer: puppet/services/ceilometer-expirer.yaml
+  OS::TripleO::Services::CeilometerExpirer: puppet/services/disabled/ceilometer-expirer.yaml
   OS::TripleO::Services::CeilometerAgentCentral: puppet/services/ceilometer-agent-central.yaml
   OS::TripleO::Services::CeilometerAgentNotification: puppet/services/ceilometer-agent-notification.yaml
   OS::TripleO::Services::ComputeCeilometerAgent: puppet/services/ceilometer-agent-compute.yaml

diff --git a/puppet/services/ceilometer-expirer.yaml b/puppet/services/ceilometer-expirer.yaml
index 714434b..eb22f33 100644 (file)
--- a/puppet/services/ceilometer-expirer.yaml
+++ b/puppet/services/ceilometer-expirer.yaml
@@ -2,6 +2,8 @@ heat_template_version: ocata
 
 description: >
   OpenStack Ceilometer Expirer service configured with Puppet
+  Note, This service is deprecated and will be removed in
+  future releases.
 
 parameters:
   ServiceNetMap:

diff --git a/puppet/services/disabled/ceilometer-expirer.yaml b/puppet/services/disabled/ceilometer-expirer.yaml
new file mode 100644 (file)
index 0000000..ec018e4
--- /dev/null
+++ b/puppet/services/disabled/ceilometer-expirer.yaml
@@ -0,0 +1,30 @@
+heat_template_version: pike
+
+description: >
+  OpenStack Ceilometer Expirer service, disabled since pike
+
+parameters:
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
+
+outputs:
+  role_data:
+    description: Role data for the disabled Ceilometer Expirer role.
+    value:
+      service_name: ceilometer_expirer
+      upgrade_tasks:
+        - name: Stop and disable ceilometer_expirer service on upgrade
+          tags: step1
+          service: name=openstack-ceilometer-expirer state=stopped enabled=no

diff --git a/releasenotes/notes/deprecate-ceilometer-expirer-83b193a07631d89d.yaml b/releasenotes/notes/deprecate-ceilometer-expirer-83b193a07631d89d.yaml
new file mode 100644 (file)
index 0000000..9088f96
--- /dev/null
+++ b/releasenotes/notes/deprecate-ceilometer-expirer-83b193a07631d89d.yaml
@@ -0,0 +1,11 @@
+---
+upgrade:
+  - With expirer deprecated and disabled by default, there is an upgrade
+    impact here. If you had expirer enabled in ocata and you upgrade to
+    pike the expirer will not be enabled anymore. If you wish to use
+    expirer, ensure you include the ceilometer-expirer.yaml
+    to your upgrade deploy command. Also note that with collector
+    disabled, there is no need for expirer to be running.
+deprecations:
+  - Deprecate and turn off expirer service as collector. Without collector
+    and standard storage, expirer has no use.

diff --git a/roles_data.yaml b/roles_data.yaml
index 67c763c..e0867cb 100644 (file)
--- a/roles_data.yaml
+++ b/roles_data.yaml
@@ -98,7 +98,6 @@
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Securetty
     - OS::TripleO::Services::Timezone
-    - OS::TripleO::Services::CeilometerExpirer
     - OS::TripleO::Services::CeilometerAgentCentral
     - OS::TripleO::Services::CeilometerAgentNotification
     - OS::TripleO::Services::Horizon