openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Add Telemetry services to scenario002"

Browse Source
This commit is contained in:
Jenkins 2017-08-05 16:22:56 +00:00 committed by Gerrit Code Review
commit 5bf7d6582b
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README.rst
View File

@ -113,13 +113,13 @@ and should be executed according to the following table:
+----------------+-------------+-------------+-------------+-------------+-----------------+--------------+ +----------------+-------------+-------------+-------------+-------------+-----------------+--------------+
| swift | | X | | | X | | | 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 | | | | | | barbican | | X | | | | |
+----------------+-------------+-------------+-------------+-------------+-----------------+--------------+ +----------------+-------------+-------------+-------------+-------------+-----------------+--------------+

13
ci/environments/scenario002-multinode.yaml
View File

@ -5,6 +5,7 @@ resource_registry:
OS::TripleO::Services::Zaqar: ../../puppet/services/zaqar.yaml OS::TripleO::Services::Zaqar: ../../puppet/services/zaqar.yaml
OS::TripleO::Services::Ec2Api: ../../puppet/services/ec2-api.yaml OS::TripleO::Services::Ec2Api: ../../puppet/services/ec2-api.yaml
OS::TripleO::Services::RabbitMQ: ../../puppet/services/pacemaker/rabbitmq.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::HAproxy: ../../puppet/services/pacemaker/haproxy.yaml
OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
OS::TripleO::Services::MySQL: ../../puppet/services/pacemaker/database/mysql.yaml OS::TripleO::Services::MySQL: ../../puppet/services/pacemaker/database/mysql.yaml
@ -68,6 +69,18 @@ parameter_defaults:
- OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::TripleoFirewall
- OS::TripleO::Services::Sshd - OS::TripleO::Services::Sshd
- OS::TripleO::Services::Iscsid - 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: ControllerExtraConfig:
nova::compute::libvirt::services::libvirt_virt_type: qemu nova::compute::libvirt::services::libvirt_virt_type: qemu
nova::compute::libvirt::libvirt_virt_type: qemu nova::compute::libvirt::libvirt_virt_type: qemu