From 2bbc07a96951273ba49513b6ce48efdab0f9d070 Mon Sep 17 00:00:00 2001 From: Pradeep Kilambi Date: Thu, 17 Aug 2017 10:47:08 -0400 Subject: [PATCH] Add Ceilometer API and Collector service to roles_data Ceilometer api and collector are disabled in pike. During upgrade case, if its not in the roles_data the disable task doesnt get picked up and continue to run. This should be removed in Queen cycle. Change-Id: I3bf555ac9488fc6622e6a62a809150082a85ea54 --- roles/Controller.yaml | 2 ++ roles/ControllerOpenstack.yaml | 1 + roles/Telemetry.yaml | 1 + roles_data.yaml | 2 ++ 4 files changed, 6 insertions(+) diff --git a/roles/Controller.yaml b/roles/Controller.yaml index 224d1356e4..5873753154 100644 --- a/roles/Controller.yaml +++ b/roles/Controller.yaml @@ -34,6 +34,8 @@ - OS::TripleO::Services::CeilometerAgentNotification # FIXME: This service was disabled in Pike and this entry should be removed # in Queens. + - OS::TripleO::Services::CeilometerApi + - OS::TripleO::Services::CeilometerCollector - OS::TripleO::Services::CeilometerExpirer - OS::TripleO::Services::CephExternal - OS::TripleO::Services::CephMds diff --git a/roles/ControllerOpenstack.yaml b/roles/ControllerOpenstack.yaml index 10d76dd77a..09018fe4a4 100644 --- a/roles/ControllerOpenstack.yaml +++ b/roles/ControllerOpenstack.yaml @@ -27,6 +27,7 @@ - OS::TripleO::Services::CeilometerAgentCentral - OS::TripleO::Services::CeilometerAgentNotification - OS::TripleO::Services::CeilometerApi + - OS::TripleO::Services::CeilometerCollector - OS::TripleO::Services::CeilometerExpirer - OS::TripleO::Services::CephExternal - OS::TripleO::Services::CephMds diff --git a/roles/Telemetry.yaml b/roles/Telemetry.yaml index b1c73798fa..31ac9a9051 100644 --- a/roles/Telemetry.yaml +++ b/roles/Telemetry.yaml @@ -15,6 +15,7 @@ - OS::TripleO::Services::CeilometerAgentCentral - OS::TripleO::Services::CeilometerAgentNotification - OS::TripleO::Services::CeilometerApi + - OS::TrieplO::Services::CeilometerCollector - OS::TripleO::Services::CeilometerExpirer - OS::TripleO::Services::GnocchiApi - OS::TripleO::Services::GnocchiMetricd diff --git a/roles_data.yaml b/roles_data.yaml index 8f67099436..c24d3adaff 100644 --- a/roles_data.yaml +++ b/roles_data.yaml @@ -37,6 +37,8 @@ - OS::TripleO::Services::CeilometerAgentNotification # FIXME: This service was disabled in Pike and this entry should be removed # in Queens. + - OS::TripleO::Services::CeilometerApi + - OS::TripleO::Services::CeilometerCollector - OS::TripleO::Services::CeilometerExpirer - OS::TripleO::Services::CephExternal - OS::TripleO::Services::CephMds