From 479821f1fa63ced9bf9eca00713a7a963437f799 Mon Sep 17 00:00:00 2001 From: Marios Andreou Date: Wed, 13 Feb 2019 09:42:41 +0200 Subject: [PATCH] Removes all pacemaker from scenario-standalone 1-3 environments The scenario 1-4 standalone envs are setting pacemaker to on with the cluster services also pointing to the pcs versions. This switches all pcs off for scen 1-3. We keep it in 4 because manila requires pcs for now. Change-Id: I026964471c15b8f85cfd4c81f3c59e3e3601d190 --- ci/environments/scenario001-standalone.yaml | 14 ++++---------- ci/environments/scenario002-standalone.yaml | 13 ++++--------- ci/environments/scenario003-standalone.yaml | 7 +------ 3 files changed, 9 insertions(+), 25 deletions(-) diff --git a/ci/environments/scenario001-standalone.yaml b/ci/environments/scenario001-standalone.yaml index c6089027d5..20922ac7c8 100644 --- a/ci/environments/scenario001-standalone.yaml +++ b/ci/environments/scenario001-standalone.yaml @@ -20,17 +20,11 @@ resource_registry: OS::TripleO::Services::HeatApiCloudwatch: ../../deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml OS::TripleO::Services::HeatEngine: ../../deployment/heat/heat-engine-container-puppet.yaml OS::TripleO::Services::MetricsQdr: ../../deployment/metrics/qdr-container-puppet.yaml - OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml + OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml - OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.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::Redis: ../../docker/services/pacemaker/database/redis.yaml - OS::TripleO::Services::MySQL: ../../docker/services/pacemaker/database/mysql.yaml - OS::TripleO::Services::CinderBackup: ../../deployment/cinder/cinder-backup-pacemaker-puppet.yaml - OS::TripleO::Services::CinderVolume: ../../deployment/cinder/cinder-volume-pacemaker-puppet.yaml - OS::TripleO::Services::Keepalived: OS::Heat::None + OS::TripleO::Services::Redis: ../../docker/services/database/redis.yaml + OS::TripleO::Services::CinderBackup: ../../deployment/cinder/cinder-backup-container-puppet.yaml + OS::TripleO::Services::CinderVolume: ../../deployment/cinder/cinder-volume-container-puppet.yaml #Needs to run scenario001 OS::TripleO::Services::Fluentd: ../../deployment/logging/fluentd-container-puppet.yaml # NOTE(mmagr): We need to disable Sensu client deployment for now as the container health check is based diff --git a/ci/environments/scenario002-standalone.yaml b/ci/environments/scenario002-standalone.yaml index bd99b7cf2a..c22f3615a3 100644 --- a/ci/environments/scenario002-standalone.yaml +++ b/ci/environments/scenario002-standalone.yaml @@ -17,16 +17,11 @@ resource_registry: OS::TripleO::Services::Zaqar: ../../deployment/zaqar/zaqar-container-puppet.yaml OS::TripleO::Services::Ec2Api: ../../docker/services/ec2-api.yaml OS::TripleO::Services::PankoApi: ../../deployment/panko/panko-api-container-puppet.yaml - OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml + OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml - OS::TripleO::Services::Redis: ../../docker/services/pacemaker/database/redis.yaml - OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.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::CinderBackup: ../../deployment/cinder/cinder-backup-pacemaker-puppet.yaml - OS::TripleO::Services::CinderVolume: ../../deployment/cinder/cinder-volume-pacemaker-puppet.yaml + OS::TripleO::Services::Redis: ../../docker/services/database/redis.yaml + OS::TripleO::Services::CinderBackup: ../../deployment/cinder/cinder-backup-container-puppet.yaml + OS::TripleO::Services::CinderVolume: ../../deployment/cinder/cinder-volume-container-puppet.yaml OS::TripleO::Services::BarbicanBackendSimpleCrypto: ../../deployment/barbican/barbican-backend-simple-crypto-puppet.yaml # 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. diff --git a/ci/environments/scenario003-standalone.yaml b/ci/environments/scenario003-standalone.yaml index 5f2e3ba144..4216032e8d 100644 --- a/ci/environments/scenario003-standalone.yaml +++ b/ci/environments/scenario003-standalone.yaml @@ -13,12 +13,7 @@ resource_registry: OS::TripleO::Services::MistralExecutor: ../../deployment/mistral/mistral-executor-container-puppet.yaml OS::TripleO::Services::MistralEventEngine: ../../deployment/mistral/mistral-event-engine-container-puppet.yaml OS::TripleO::Services::OsloMessagingRpc: ../../deployment/messaging/rpc-qdrouterd-container-puppet.yaml - OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml - OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.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::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml OS::TripleO::Services::DesignateApi: ../../deployment/designate/designate-api-container-puppet.yaml OS::TripleO::Services::DesignateCentral: ../../deployment/designate/designate-central-container-puppet.yaml OS::TripleO::Services::DesignateProducer: ../../deployment/designate/designate-producer-container-puppet.yaml