Browse Source

Merge "Disable Pacemaker on scenario000" into stable/stein

tags/10.6.1
Zuul 2 weeks ago
parent
commit
ab9ae7a94a
1 changed files with 3 additions and 12 deletions
  1. 3
    12
      ci/environments/scenario000-multinode-containers.yaml

+ 3
- 12
ci/environments/scenario000-multinode-containers.yaml View File

@@ -5,21 +5,13 @@ resource_registry:
5 5
   # Since the OVB jobs also test this functionality we can shut it off here.
6 6
   OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml
7 7
 
8
-  OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
8
+  OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml
9 9
   OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
10
-  OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml
11
-  OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
12
-  OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml
13
-  OS::TripleO::Services::Clustercheck: ../../deployment/pacemaker/clustercheck-container-puppet.yaml
14
-  OS::TripleO::Services::MySQL: ../../deployment/database/mysql-pacemaker-puppet.yaml
15
-  OS::TripleO::Services::Keepalived: OS::Heat::None
16 10
 
17 11
 parameter_defaults:
18 12
   ControllerServices:
19 13
     - OS::TripleO::Services::CACerts
20
-    - OS::TripleO::Services::Clustercheck
21 14
     - OS::TripleO::Services::ContainerImagePrepare
22
-    - OS::TripleO::Services::Docker
23 15
     - OS::TripleO::Services::Kernel
24 16
     - OS::TripleO::Services::Keystone
25 17
     - OS::TripleO::Services::MySQL
@@ -29,7 +21,7 @@ parameter_defaults:
29 21
     - OS::TripleO::Services::HAproxy
30 22
     - OS::TripleO::Services::Keepalived
31 23
     - OS::TripleO::Services::Memcached
32
-    - OS::TripleO::Services::Pacemaker
24
+    - OS::TripleO::Services::Podman
33 25
     - OS::TripleO::Services::Snmp
34 26
     - OS::TripleO::Services::Timesync
35 27
     - OS::TripleO::Services::Timezone
@@ -39,5 +31,4 @@ parameter_defaults:
39 31
   Debug: true
40 32
   DockerPuppetDebug: True
41 33
   NotificationDriver: 'noop'
42
-  # Remove ContainerCli once this scenario is tested on CentOS8
43
-  ContainerCli: docker
34
+  ContainerCli: podman

Loading…
Cancel
Save