From 1fd5d9ea8b1c26a6a1aaea0427915459e55656ef Mon Sep 17 00:00:00 2001 From: Jiri Stransky Date: Mon, 28 Aug 2017 16:05:26 +0200 Subject: Add clustercheck to service list for scenarios This service is necessary when we containerized TripleO with Pacemaker. The service is added also to non-containerized scenario lists, because the aim is to get rid of the -containers.yaml variants eventually. This shouldn't affect any jobs that don't include docker-ha.yaml. The resource registry entry is mapped to OS::Heat::None by default, and docker-ha.yaml maps it to actual containerized clustercheck. Change-Id: I342e29de52cb6ce069a05a2dbfb0501a2da200e6 Partial-Bug: #1712070 (cherry picked from commit 5b805cb37eec3097552314c6ce43c02c2a604d81) --- ci/environments/multinode-3nodes.yaml | 1 + ci/environments/multinode-containers.yaml | 1 + ci/environments/multinode.yaml | 1 + ci/environments/multinode_major_upgrade.yaml | 1 + ci/environments/scenario001-multinode-containers.yaml | 1 + ci/environments/scenario001-multinode.yaml | 1 + ci/environments/scenario002-multinode-containers.yaml | 1 + ci/environments/scenario002-multinode.yaml | 1 + ci/environments/scenario003-multinode-containers.yaml | 1 + ci/environments/scenario003-multinode.yaml | 1 + ci/environments/scenario004-multinode-containers.yaml | 1 + ci/environments/scenario004-multinode.yaml | 1 + ci/environments/scenario006-multinode-containers.yaml | 1 + ci/environments/scenario007-multinode-containers.yaml | 1 + ci/environments/scenario007-multinode.yaml | 1 + 15 files changed, 15 insertions(+) (limited to 'ci') diff --git a/ci/environments/multinode-3nodes.yaml b/ci/environments/multinode-3nodes.yaml index e040b015..647b1c65 100644 --- a/ci/environments/multinode-3nodes.yaml +++ b/ci/environments/multinode-3nodes.yaml @@ -24,6 +24,7 @@ - OS::TripleO::Services::CACerts - OS::TripleO::Services::CinderApi - OS::TripleO::Services::CinderScheduler + - OS::TripleO::Services::Clustercheck - OS::TripleO::Services::Docker - OS::TripleO::Services::Kernel - OS::TripleO::Services::Keystone diff --git a/ci/environments/multinode-containers.yaml b/ci/environments/multinode-containers.yaml index 03baf4aa..f050d9a2 100644 --- a/ci/environments/multinode-containers.yaml +++ b/ci/environments/multinode-containers.yaml @@ -25,6 +25,7 @@ parameter_defaults: - OS::TripleO::Services::CinderApi - OS::TripleO::Services::CinderScheduler - OS::TripleO::Services::CinderVolume + - OS::TripleO::Services::Clustercheck - OS::TripleO::Services::Docker - OS::TripleO::Services::Kernel - OS::TripleO::Services::Keystone diff --git a/ci/environments/multinode.yaml b/ci/environments/multinode.yaml index f945a021..eeeefc07 100644 --- a/ci/environments/multinode.yaml +++ b/ci/environments/multinode.yaml @@ -21,6 +21,7 @@ parameter_defaults: - OS::TripleO::Services::CinderApi - OS::TripleO::Services::CinderScheduler - OS::TripleO::Services::CinderVolume + - OS::TripleO::Services::Clustercheck - OS::TripleO::Services::Docker - OS::TripleO::Services::Kernel - OS::TripleO::Services::Keystone diff --git a/ci/environments/multinode_major_upgrade.yaml b/ci/environments/multinode_major_upgrade.yaml index 81301349..78127a4f 100644 --- a/ci/environments/multinode_major_upgrade.yaml +++ b/ci/environments/multinode_major_upgrade.yaml @@ -14,6 +14,7 @@ resource_registry: parameter_defaults: ControllerServices: - OS::TripleO::Services::CACerts + - OS::TripleO::Services::Clustercheck - OS::TripleO::Services::Docker - OS::TripleO::Services::Kernel - OS::TripleO::Services::Keystone diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml index 46e8c5d2..5014a79b 100644 --- a/ci/environments/scenario001-multinode-containers.yaml +++ b/ci/environments/scenario001-multinode-containers.yaml @@ -29,6 +29,7 @@ resource_registry: parameter_defaults: ControllerServices: + - OS::TripleO::Services::Clustercheck - OS::TripleO::Services::Docker - OS::TripleO::Services::Kernel - OS::TripleO::Services::Keystone diff --git a/ci/environments/scenario001-multinode.yaml b/ci/environments/scenario001-multinode.yaml index 302b0344..a9fbdfb7 100644 --- a/ci/environments/scenario001-multinode.yaml +++ b/ci/environments/scenario001-multinode.yaml @@ -27,6 +27,7 @@ resource_registry: parameter_defaults: ControllerServices: + - OS::TripleO::Services::Clustercheck - OS::TripleO::Services::Docker - OS::TripleO::Services::Kernel - OS::TripleO::Services::Keystone diff --git a/ci/environments/scenario002-multinode-containers.yaml b/ci/environments/scenario002-multinode-containers.yaml index 43acf6dc..f1dc2683 100644 --- a/ci/environments/scenario002-multinode-containers.yaml +++ b/ci/environments/scenario002-multinode-containers.yaml @@ -22,6 +22,7 @@ resource_registry: parameter_defaults: ControllerServices: + - OS::TripleO::Services::Clustercheck - OS::TripleO::Services::Docker - OS::TripleO::Services::Kernel - OS::TripleO::Services::Keystone diff --git a/ci/environments/scenario002-multinode.yaml b/ci/environments/scenario002-multinode.yaml index 5670c213..6c7f4ebb 100644 --- a/ci/environments/scenario002-multinode.yaml +++ b/ci/environments/scenario002-multinode.yaml @@ -22,6 +22,7 @@ resource_registry: parameter_defaults: ControllerServices: + - OS::TripleO::Services::Clustercheck - OS::TripleO::Services::Docker - OS::TripleO::Services::Kernel - OS::TripleO::Services::Keystone diff --git a/ci/environments/scenario003-multinode-containers.yaml b/ci/environments/scenario003-multinode-containers.yaml index e3789ea8..107b66b2 100644 --- a/ci/environments/scenario003-multinode-containers.yaml +++ b/ci/environments/scenario003-multinode-containers.yaml @@ -24,6 +24,7 @@ resource_registry: parameter_defaults: ControllerServices: + - OS::TripleO::Services::Clustercheck - OS::TripleO::Services::Docker - OS::TripleO::Services::Kernel - OS::TripleO::Services::Keystone diff --git a/ci/environments/scenario003-multinode.yaml b/ci/environments/scenario003-multinode.yaml index 5e797b40..968a881b 100644 --- a/ci/environments/scenario003-multinode.yaml +++ b/ci/environments/scenario003-multinode.yaml @@ -20,6 +20,7 @@ resource_registry: parameter_defaults: ControllerServices: + - OS::TripleO::Services::Clustercheck - OS::TripleO::Services::Docker - OS::TripleO::Services::Kernel - OS::TripleO::Services::Keystone diff --git a/ci/environments/scenario004-multinode-containers.yaml b/ci/environments/scenario004-multinode-containers.yaml index 5590de26..e6817996 100644 --- a/ci/environments/scenario004-multinode-containers.yaml +++ b/ci/environments/scenario004-multinode-containers.yaml @@ -38,6 +38,7 @@ parameter_defaults: - OS::TripleO::Services::CephMon - OS::TripleO::Services::CephOSD - OS::TripleO::Services::CephRgw + - OS::TripleO::Services::Clustercheck - OS::TripleO::Services::Docker - OS::TripleO::Services::Kernel - OS::TripleO::Services::Keystone diff --git a/ci/environments/scenario004-multinode.yaml b/ci/environments/scenario004-multinode.yaml index bd30347a..a81f05e1 100644 --- a/ci/environments/scenario004-multinode.yaml +++ b/ci/environments/scenario004-multinode.yaml @@ -36,6 +36,7 @@ parameter_defaults: - OS::TripleO::Services::CephMon - OS::TripleO::Services::CephOSD - OS::TripleO::Services::CephRgw + - OS::TripleO::Services::Clustercheck - OS::TripleO::Services::Docker - OS::TripleO::Services::Kernel - OS::TripleO::Services::Keystone diff --git a/ci/environments/scenario006-multinode-containers.yaml b/ci/environments/scenario006-multinode-containers.yaml index 4715e339..d0a952d5 100644 --- a/ci/environments/scenario006-multinode-containers.yaml +++ b/ci/environments/scenario006-multinode-containers.yaml @@ -9,6 +9,7 @@ resource_registry: parameter_defaults: ControllerServices: + - OS::TripleO::Services::Clustercheck - OS::TripleO::Services::Docker - OS::TripleO::Services::Kernel - OS::TripleO::Services::Keystone diff --git a/ci/environments/scenario007-multinode-containers.yaml b/ci/environments/scenario007-multinode-containers.yaml index 8e1e6b6c..faf56ba4 100644 --- a/ci/environments/scenario007-multinode-containers.yaml +++ b/ci/environments/scenario007-multinode-containers.yaml @@ -15,6 +15,7 @@ resource_registry: OS::TripleO::Services::NovaMigrationTarget: OS::Heat::None parameter_defaults: ControllerServices: + - OS::TripleO::Services::Clustercheck - OS::TripleO::Services::Docker - OS::TripleO::Services::Kernel - OS::TripleO::Services::Keystone diff --git a/ci/environments/scenario007-multinode.yaml b/ci/environments/scenario007-multinode.yaml index dd73f476..69a63d8e 100644 --- a/ci/environments/scenario007-multinode.yaml +++ b/ci/environments/scenario007-multinode.yaml @@ -22,6 +22,7 @@ resource_registry: parameter_defaults: ControllerServices: + - OS::TripleO::Services::Clustercheck - OS::TripleO::Services::Docker - OS::TripleO::Services::Kernel - OS::TripleO::Services::Keystone -- cgit 1.2.3-korg