From 0a9938038920f0d77c1059fe2cc3779ce3f87cd3 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Mon, 3 Dec 2018 11:19:27 -0500 Subject: [PATCH] Disable pacemaker on multinode-containers (fs010) The integration between podman and pacemaker is still work in progress. While it's being done, let's remove pacemaker from this job, so we can have at least one CI job running with podman on the overcloud. We still have coverage for pacemaker in the container-upgrade jobs. This patch will likely be reverted once we have pacemaker + podman ready for centos7. Change-Id: I8638386c8f394c98b047fb2ae4ff97daeeaf4475 --- ci/environments/multinode-containers.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/ci/environments/multinode-containers.yaml b/ci/environments/multinode-containers.yaml index 0e5c6c2aa2..f888d961a9 100644 --- a/ci/environments/multinode-containers.yaml +++ b/ci/environments/multinode-containers.yaml @@ -1,14 +1,6 @@ resource_registry: OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode-os-net-config.yaml OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode-os-net-config.yaml - OS::TripleO::Services::OsloMessagingRpc: ../../docker/services/pacemaker/rpc-rabbitmq.yaml - OS::TripleO::Services::OsloMessagingNotify: ../../docker/services/messaging/notify-rabbitmq-shared.yaml - OS::TripleO::Services::HAproxy: ../../docker/services/pacemaker/haproxy.yaml - OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml - 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::Keepalived: OS::Heat::None # Some infra instances don't pass the ping test but are otherwise working. # Since the OVB jobs also test this functionality we can shut it off here. OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml @@ -16,7 +8,6 @@ resource_registry: parameter_defaults: ControllerServices: - OS::TripleO::Services::CACerts - - OS::TripleO::Services::Clustercheck - OS::TripleO::Services::ContainerImagePrepare - OS::TripleO::Services::Docker - OS::TripleO::Services::Podman @@ -36,7 +27,6 @@ parameter_defaults: - OS::TripleO::Services::HAproxy - OS::TripleO::Services::Keepalived - OS::TripleO::Services::Memcached - - OS::TripleO::Services::Pacemaker - OS::TripleO::Services::NovaConductor - OS::TripleO::Services::NovaApi - OS::TripleO::Services::NovaPlacement