From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Mon, 22 May 2017 07:13:53 +0000 (+0300)
Subject: Re-Add ceilometer expirer to roles_data
X-Git-Tag: opnfv-6.0.0~640^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=25bb189b7b969398afa8447a2e140bb0a4edbaf9;p=apex-tripleo-heat-templates.git

Re-Add ceilometer expirer to roles_data

Even though this service was disabled by default in Pike[1], we still
want the entry in roles_data since it will actually disable the service
on upgrade.

A comment was added so we remember to remove it in Queens.

[1] Icffb7d1bb2cf7bd61026be7d2dcfbd70cd3bcbda

Change-Id: I2012d7494207bf3239f589bf80b8048abf72428f
---

diff --git a/roles_data.yaml b/roles_data.yaml
index 3e0ef752..68d0b9e2 100644
--- a/roles_data.yaml
+++ b/roles_data.yaml
@@ -99,6 +99,9 @@
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Securetty
     - OS::TripleO::Services::Timezone
+    # FIXME: This service was disabled in Pike and this entry should be removed
+    # in Queens.
+    - OS::TripleO::Services::CeilometerExpirer
     - OS::TripleO::Services::CeilometerAgentCentral
     - OS::TripleO::Services::CeilometerAgentNotification
     - OS::TripleO::Services::Horizon