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

@@ -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

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

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

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