Merge "Disable pacemaker on multinode-containers (fs010)"

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