openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "OpenShift: Don't pre-install Docker"

This commit is contained in:
Zuul 2018-01-23 23:21:36 +00:00 committed by Gerrit Code Review
parent 5675d7202e e2c18c34ec
commit 57b5b9fe5b
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,13 +26,12 @@ resource_registry:
OS::TripleO::Services::NovaScheduler: OS::Heat::None
OS::TripleO::Services::NovaCompute: OS::Heat::None
OS::TripleO::Services::NovaLibvirt: OS::Heat::None
OS::TripleO::Services::Docker: ../../puppet/services/docker.yaml
OS::TripleO::Services::Docker: OS::Heat::None
parameter_defaults:
ControllerServices:
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Kernel
- OS::TripleO::Services::Ntp
- OS::TripleO::Services::Snmp
@ -43,7 +42,6 @@ parameter_defaults:
- OS::TripleO::Services::OpenShift::Master
- OS::TripleO::Services::OpenShift::Worker
ComputeServices:
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Kernel
- OS::TripleO::Services::Ntp
- OS::TripleO::Services::Snmp