openstack
/
tripleo-heat-templates
Code Issues Proposed changes

CI: move tacker / congress from scenario001 to 007 

scenario001 is timeouting a lot while scenario 007 is fine and far from
timeout limit, so moving out services.

Change-Id: Id34321f95a0584cbc9f6e40f3cd47ed0386cfc9d
This commit is contained in:
Emilien Macchi 2017-12-29 13:52:48 -08:00
parent ae81ed9f93
commit f855222a93
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ci/environments/scenario001-multinode-containers.yaml
View File

@ -7,10 +7,6 @@ resource_registry:
OS::TripleO::Services::CephClient: ../../docker/services/ceph-ansible/ceph-client.yaml
OS::TripleO::Services::PankoApi: ../../docker/services/panko-api.yaml
OS::TripleO::Services::Collectd: ../../docker/services/collectd.yaml
# TODO(mandre) fix the tacker service - https://bugs.launchpad.net/tripleo/+bug/1714270
# OS::TripleO::Services::Tacker: ../../docker/services/tacker.yaml
OS::TripleO::Services::Tacker: ../../puppet/services/tacker.yaml
OS::TripleO::Services::Congress: ../../docker/services/congress.yaml
OS::TripleO::Services::RabbitMQ: ../../docker/services/pacemaker/rabbitmq.yaml
OS::TripleO::Services::HAproxy: ../../docker/services/pacemaker/haproxy.yaml
OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
@ -89,8 +85,6 @@ parameter_defaults:
- OS::TripleO::Services::CinderScheduler
- OS::TripleO::Services::CinderVolume
- OS::TripleO::Services::Collectd
- OS::TripleO::Services::Tacker
- OS::TripleO::Services::Congress
- OS::TripleO::Services::TripleoPackages
- OS::TripleO::Services::TripleoFirewall
- OS::TripleO::Services::Fluentd

6
ci/environments/scenario007-multinode-containers.yaml
View File

@ -10,6 +10,10 @@ resource_registry:
OS::TripleO::Services::SwiftProxy: OS::Heat::None
OS::TripleO::Services::SwiftStorage: OS::Heat::None
OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None
# TODO(mandre) fix the tacker service - https://bugs.launchpad.net/tripleo/+bug/1714270
# OS::TripleO::Services::Tacker: ../../docker/services/tacker.yaml
OS::TripleO::Services::Tacker: ../../puppet/services/tacker.yaml
OS::TripleO::Services::Congress: ../../docker/services/congress.yaml
parameter_defaults:
ControllerServices:
- OS::TripleO::Services::Clustercheck
@ -46,6 +50,8 @@ parameter_defaults:
- OS::TripleO::Services::TripleoFirewall
- OS::TripleO::Services::Sshd
- OS::TripleO::Services::Iscsid
- OS::TripleO::Services::Tacker
- OS::TripleO::Services::Congress
ControllerExtraConfig:
nova::compute::libvirt::services::libvirt_virt_type: qemu
nova::compute::libvirt::libvirt_virt_type: qemu

6
zuul.d/layout.yaml
View File

@ -39,14 +39,12 @@
- ^(docker|puppet)/services/ceilometer.*$
- ^(docker|puppet)/services/ceph.*$
- ^(docker|puppet)/services/cinder.*$
- ^(docker|puppet)/services/congress.*$
- ^(docker|puppet)/services/glance.*$
- ^(docker|puppet)/services/gnocchi.*$
- ^(docker|puppet)/services/logging.*$
- ^(docker|puppet)/services/metrics.*$
- ^(docker|puppet)/services/monitoring.*$
- ^(docker|puppet)/services/panko.*$
- ^(docker|puppet)/services/tacker.*$
- ci/environments/scenario001-multinode-containers.yaml
- ci/pingtests/scenario001.*$
- ^environments\/.*.yaml
@ -132,6 +130,8 @@
- ci/environments/scenario007-multinode-containers.yaml
- ci/pingtests/scenario007-multinode.yaml
- ^(docker|puppet)/services/.*ovn.*$
- ^(docker|puppet)/services/congress.*$
- ^(docker|puppet)/services/tacker.*$
- ^environments\/.*.yaml
gate:
queue: tripleo
@ -203,6 +203,8 @@
- ci/environments/scenario007-multinode-containers.yaml
- ci/pingtests/scenario007-multinode.yaml
- ^(docker|puppet)/services/.*ovn.*$
- ^(docker|puppet)/services/congress.*$
- ^(docker|puppet)/services/tacker.*$
- ^environments\/.*.yaml
experimental:
jobs: