From 2fa0ecece55443ce47c9e98edc3e13cc1a93dad4 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Fri, 29 Dec 2017 07:38:03 -0800 Subject: [PATCH] multinode-contaier: reduce the number of services The job timeouts too much, some services are already covered by scenarios, no need to duplicate testing. Change-Id: I30092400142af5c3308534a8da9daa22cbb82bad Depends-On: I2a4aa707fa10664f1fc9026e3eb417f35834436f --- ci/environments/multinode-containers.yaml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/ci/environments/multinode-containers.yaml b/ci/environments/multinode-containers.yaml index a9f635b91f..d2ff14f8c2 100644 --- a/ci/environments/multinode-containers.yaml +++ b/ci/environments/multinode-containers.yaml @@ -7,7 +7,6 @@ resource_registry: OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml OS::TripleO::Services::Clustercheck: ../../docker/services/pacemaker/clustercheck.yaml OS::TripleO::Services::MySQL: ../../docker/services/pacemaker/database/mysql.yaml - OS::TripleO::Services::CinderVolume: ../../docker/services/pacemaker/cinder-volume.yaml OS::TripleO::Services::Keepalived: OS::Heat::None OS::TripleO::Tasks::ControllerPreConfig: OS::Heat::None OS::TripleO::Tasks::ControllerPostConfig: OS::Heat::None @@ -18,11 +17,6 @@ resource_registry: parameter_defaults: ControllerServices: - - OS::TripleO::Services::CephMon - - OS::TripleO::Services::CephOSD - - OS::TripleO::Services::CinderApi - - OS::TripleO::Services::CinderScheduler - - OS::TripleO::Services::CinderVolume - OS::TripleO::Services::Clustercheck - OS::TripleO::Services::Docker - OS::TripleO::Services::Kernel @@ -61,16 +55,6 @@ parameter_defaults: ControllerExtraConfig: nova::compute::libvirt::services::libvirt_virt_type: qemu nova::compute::libvirt::libvirt_virt_type: qemu - # Required for Centos 7.3 and Qemu 2.6.0 - nova::compute::libvirt::libvirt_cpu_mode: 'none' - #NOTE(gfidente): not great but we need this to deploy on ext4 - #http://docs.ceph.com/docs/jewel/rados/configuration/filesystem-recommendations/ - ceph::profile::params::osd_max_object_name_len: 256 - ceph::profile::params::osd_max_object_namespace_len: 64 - #NOTE(gfidente): necessary when deploying a single OSD - ceph::profile::params::osd_pool_default_pg_num: 32 - ceph::profile::params::osd_pool_default_pgp_num: 32 - SwiftCeilometerPipelineEnabled: False Debug: True NotificationDriver: 'noop' GlanceBackend: 'file'