openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Add CACerts service to all scenario environment files"

Browse Source
This commit is contained in:
Zuul
2018-04-12 18:39:50 +00:00
committed by Gerrit Code Review
parent 6461bab97d 00c9ec85c9
commit b10b9ac4cd
9 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ci/environments/multinode-containers.yaml
View File

@@ -17,6 +17,7 @@ resource_registry:
parameter_defaults:
ControllerServices:
- OS::TripleO::Services::CACerts
- OS::TripleO::Services::Clustercheck
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Kernel

1
ci/environments/multinode.yaml
View File

@@ -16,6 +16,7 @@ resource_registry:
parameter_defaults:
ControllerServices:
- OS::TripleO::Services::CACerts
- OS::TripleO::Services::CephMon
- OS::TripleO::Services::CephOSD
- OS::TripleO::Services::CinderApi

1
ci/environments/scenario000-multinode-containers.yaml
View File

@@ -17,6 +17,7 @@ resource_registry:
parameter_defaults:
ControllerServices:
- OS::TripleO::Services::CACerts
- OS::TripleO::Services::Clustercheck
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Kernel

1
ci/environments/scenario001-multinode-containers.yaml
View File

@@ -29,6 +29,7 @@ resource_registry:
parameter_defaults:
ControllerServices:
- OS::TripleO::Services::CACerts
- OS::TripleO::Services::Clustercheck
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Kernel

1
ci/environments/scenario002-multinode-containers.yaml
View File

@@ -25,6 +25,7 @@ resource_registry:
parameter_defaults:
ControllerServices:
- OS::TripleO::Services::CACerts
- OS::TripleO::Services::Clustercheck
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Kernel

1
ci/environments/scenario004-multinode-containers.yaml
View File

@@ -39,6 +39,7 @@ resource_registry:
parameter_defaults:
ControllerServices:
- OS::TripleO::Services::CACerts
- OS::TripleO::Services::CephMds
- OS::TripleO::Services::CephMgr
- OS::TripleO::Services::CephMon

2
ci/environments/scenario006-multinode.yaml
View File

@@ -36,6 +36,7 @@ parameter_defaults:
KubesprayIgnoreAssertErrors: true
ControllerServices:
- OS::TripleO::Services::CACerts
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Kernel
- OS::TripleO::Services::Ntp
@@ -47,6 +48,7 @@ parameter_defaults:
- OS::TripleO::Services::Kubernetes::Master
- OS::TripleO::Services::Kubernetes::Worker
ComputeServices:
- OS::TripleO::Services::CACerts
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Kernel
- OS::TripleO::Services::Ntp

1
ci/environments/scenario007-multinode-containers.yaml
View File

@@ -18,6 +18,7 @@ resource_registry:
OS::TripleO::Services::Congress: ../../docker/services/congress.yaml
parameter_defaults:
ControllerServices:
- OS::TripleO::Services::CACerts
- OS::TripleO::Services::Clustercheck
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Kernel

2
ci/environments/scenario009-multinode.yaml
View File

@@ -32,6 +32,7 @@ resource_registry:
parameter_defaults:
ControllerServices:
- OS::TripleO::Services::CACerts
- OS::TripleO::Services::Kernel
- OS::TripleO::Services::Ntp
- OS::TripleO::Services::Snmp
@@ -42,6 +43,7 @@ parameter_defaults:
- OS::TripleO::Services::OpenShift::Master
- OS::TripleO::Services::OpenShift::Worker
ComputeServices:
- OS::TripleO::Services::CACerts
- OS::TripleO::Services::Kernel
- OS::TripleO::Services::Ntp
- OS::TripleO::Services::Snmp