Add Telemetry services to scenario002

We need to test gnocchi with swift backend. So adding
telemetry to scenario002 job to cover that.

Change-Id: I284de61bbefac9e9b37390650016643ffe38b5cc

diff --git a/README.rst b/README.rst
index f670fa6..93c443b 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -113,13 +113,13 @@ and should be executed according to the following table:
 +----------------+-------------+-------------+-------------+-------------+-----------------+--------------+
 | swift          |             |      X      |             |             |        X        |              |
 +----------------+-------------+-------------+-------------+-------------+-----------------+--------------+
-| aodh           |      X      |             |             |             |                 |              |
+| aodh           |      X      |      X      |             |             |                 |              |
 +----------------+-------------+-------------+-------------+-------------+-----------------+--------------+
-| ceilometer     |      X      |             |             |             |                 |              |
+| ceilometer     |      X      |      X      |             |             |                 |              |
 +----------------+-------------+-------------+-------------+-------------+-----------------+--------------+
-| gnocchi        |      X      |             |             |             |                 |              |
+| gnocchi        |     rbd     |    swift    |             |             |                 |              |
 +----------------+-------------+-------------+-------------+-------------+-----------------+--------------+
-| panko          |      X      |             |             |             |                 |              |
+| panko          |      X      |      X      |             |             |                 |              |
 +----------------+-------------+-------------+-------------+-------------+-----------------+--------------+
 | barbican       |             |      X      |             |             |                 |              |
 +----------------+-------------+-------------+-------------+-------------+-----------------+--------------+

diff --git a/ci/environments/scenario002-multinode.yaml b/ci/environments/scenario002-multinode.yaml
index cdbcbfd..513d3f7 100644 (file)
--- a/ci/environments/scenario002-multinode.yaml
+++ b/ci/environments/scenario002-multinode.yaml
@@ -5,6 +5,7 @@ resource_registry:
   OS::TripleO::Services::Zaqar: ../../puppet/services/zaqar.yaml
   OS::TripleO::Services::Ec2Api: ../../puppet/services/ec2-api.yaml
   OS::TripleO::Services::RabbitMQ: ../../puppet/services/pacemaker/rabbitmq.yaml
+  OS::TripleO::Services::Redis: ../../puppet/services/pacemaker/database/redis.yaml
   OS::TripleO::Services::HAproxy: ../../puppet/services/pacemaker/haproxy.yaml
   OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
   OS::TripleO::Services::MySQL: ../../puppet/services/pacemaker/database/mysql.yaml
@@ -68,6 +69,18 @@ parameter_defaults:
     - OS::TripleO::Services::TripleoFirewall
     - OS::TripleO::Services::Sshd
     - OS::TripleO::Services::Iscsid
+    - OS::TripleO::Services::Redis
+    - OS::TripleO::Services::AodhApi
+    - OS::TripleO::Services::AodhEvaluator
+    - OS::TripleO::Services::AodhNotifier
+    - OS::TripleO::Services::AodhListener
+    - OS::TripleO::Services::CeilometerAgentCentral
+    - OS::TripleO::Services::CeilometerAgentIpmi
+    - OS::TripleO::Services::CeilometerAgentNotification
+    - OS::TripleO::Services::GnocchiApi
+    - OS::TripleO::Services::GnocchiMetricd
+    - OS::TripleO::Services::GnocchiStatsd
+    - OS::TripleO::Services::PankoApi
   ControllerExtraConfig:
     nova::compute::libvirt::services::libvirt_virt_type: qemu
     nova::compute::libvirt::libvirt_virt_type: qemu