summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2018-07-27 12:38:47 -0400
committerTim Rozet <trozet@redhat.com>2018-07-27 12:38:47 -0400
commit03d3f7b385c809bc4c7e69619dbdc0e7ed830bd6 (patch)
tree803b1e32e56166a28a2863a197421676e38eae75
parentabc17537bc6fd0337e4673fd2bc1fc5c46588097 (diff)
Updates CSIT env files
NovaPlacementApi is not needed on compute nodes and is not default on compute nodes upstream, so removing it. Also adds clustercheck and sql clients to the both roles. Change-Id: Ia9d9fb4f115bc9850be46043a03688b55149f5df Signed-off-by: Tim Rozet <trozet@redhat.com>
-rw-r--r--build/csit-environment.yaml4
-rw-r--r--build/csit-queens-environment.yaml4
2 files changed, 6 insertions, 2 deletions
diff --git a/build/csit-environment.yaml b/build/csit-environment.yaml
index fdceb0c1..3d531ffb 100644
--- a/build/csit-environment.yaml
+++ b/build/csit-environment.yaml
@@ -39,12 +39,14 @@ parameter_defaults:
UseDNS: 'no'
ControllerServices:
- OS::TripleO::Services::CACerts
+ - OS::TripleO::Services::Clustercheck
- OS::TripleO::Services::Kernel
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Keystone
- OS::TripleO::Services::GlanceApi
- OS::TripleO::Services::GlanceRegistry
- OS::TripleO::Services::MySQL
+ - OS::TripleO::Services::MySQLClient
- OS::TripleO::Services::NeutronDhcpAgent
- OS::TripleO::Services::NeutronMetadataAgent
- OS::TripleO::Services::NeutronApi
@@ -77,13 +79,13 @@ parameter_defaults:
- OS::TripleO::Services::Ntp
- OS::TripleO::Services::Snmp
- OS::TripleO::Services::Sshd
+ - OS::TripleO::Services::MySQLClient
- OS::TripleO::Services::NovaCompute
- OS::TripleO::Services::NovaLibvirt
- OS::TripleO::Services::Kernel
- OS::TripleO::Services::Docker
- OS::TripleO::Services::ComputeNeutronCorePlugin
- OS::TripleO::Services::ComputeNeutronMetadataAgent
- - OS::TripleO::Services::NovaPlacement
- OS::TripleO::Services::TripleoPackages
- OS::TripleO::Services::TripleoFirewall
- OS::TripleO::Services::NeutronSriovAgent
diff --git a/build/csit-queens-environment.yaml b/build/csit-queens-environment.yaml
index 37e9a89b..cba7cb0a 100644
--- a/build/csit-queens-environment.yaml
+++ b/build/csit-queens-environment.yaml
@@ -39,12 +39,14 @@ parameter_defaults:
UseDNS: 'no'
ControllerServices:
- OS::TripleO::Services::CACerts
+ - OS::TripleO::Services::Clustercheck
- OS::TripleO::Services::Kernel
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Keystone
- OS::TripleO::Services::GlanceApi
- OS::TripleO::Services::GlanceRegistry
- OS::TripleO::Services::MySQL
+ - OS::TripleO::Services::MySQLClient
- OS::TripleO::Services::NeutronDhcpAgent
- OS::TripleO::Services::NeutronMetadataAgent
- OS::TripleO::Services::NeutronApi
@@ -76,13 +78,13 @@ parameter_defaults:
- OS::TripleO::Services::Ntp
- OS::TripleO::Services::Snmp
- OS::TripleO::Services::Sshd
+ - OS::TripleO::Services::MySQLClient
- OS::TripleO::Services::NovaCompute
- OS::TripleO::Services::NovaLibvirt
- OS::TripleO::Services::Kernel
- OS::TripleO::Services::Docker
- OS::TripleO::Services::ComputeNeutronCorePlugin
- OS::TripleO::Services::ComputeNeutronMetadataAgent
- - OS::TripleO::Services::NovaPlacement
- OS::TripleO::Services::TripleoPackages
- OS::TripleO::Services::TripleoFirewall
- OS::TripleO::Services::NeutronSriovAgent