openstack/tripleo-heat-templates
Code Issues Proposed changes

Add docker service to OpenShift CI roles

Browse Source 
This ensures the docker service on the openshift nodes is able to pull
from a local registry if configured this way.

Change-Id: Ifd48b2e6500b10d108985a4a9f1d73493d404134
Depends-On: I31494ff8524b90343e6e8c67bd08a354837ecc45
This commit is contained in:
Martin André 2018-06-06 17:22:19 +02:00
parent d3f8ac065f
commit b9caa67a62
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,13 +26,13 @@ resource_registry:
OS::TripleO::Services::NovaScheduler: OS::Heat::None OS::TripleO::Services::NovaScheduler: OS::Heat::None
OS::TripleO::Services::NovaCompute: OS::Heat::None OS::TripleO::Services::NovaCompute: OS::Heat::None
OS::TripleO::Services::NovaLibvirt: OS::Heat::None OS::TripleO::Services::NovaLibvirt: OS::Heat::None
OS::TripleO::Services::Docker: OS::Heat::None
parameter_defaults: parameter_defaults:
ControllerServices: ControllerServices:
- OS::TripleO::Services::CACerts - OS::TripleO::Services::CACerts
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Kernel - OS::TripleO::Services::Kernel
- OS::TripleO::Services::Ntp - OS::TripleO::Services::Ntp
- OS::TripleO::Services::Snmp - OS::TripleO::Services::Snmp
@ -44,6 +44,7 @@ parameter_defaults:
- OS::TripleO::Services::OpenShift::Worker - OS::TripleO::Services::OpenShift::Worker
ComputeServices: ComputeServices:
- OS::TripleO::Services::CACerts - OS::TripleO::Services::CACerts
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Kernel - OS::TripleO::Services::Kernel
- OS::TripleO::Services::Ntp - OS::TripleO::Services::Ntp
- OS::TripleO::Services::Snmp - OS::TripleO::Services::Snmp