From b9caa67a628e9b2e5316872ee8fa40fcb2cd8991 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Andr=C3=A9?= Date: Wed, 6 Jun 2018 17:22:19 +0200 Subject: [PATCH] Add docker service to OpenShift CI roles 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 --- ci/environments/scenario009-multinode.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/environments/scenario009-multinode.yaml b/ci/environments/scenario009-multinode.yaml index 30506c5858..926e42c298 100644 --- a/ci/environments/scenario009-multinode.yaml +++ b/ci/environments/scenario009-multinode.yaml @@ -26,13 +26,13 @@ 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: OS::Heat::None parameter_defaults: ControllerServices: - OS::TripleO::Services::CACerts + - OS::TripleO::Services::Docker - OS::TripleO::Services::Kernel - OS::TripleO::Services::Ntp - OS::TripleO::Services::Snmp @@ -44,6 +44,7 @@ parameter_defaults: - OS::TripleO::Services::OpenShift::Worker ComputeServices: - OS::TripleO::Services::CACerts + - OS::TripleO::Services::Docker - OS::TripleO::Services::Kernel - OS::TripleO::Services::Ntp - OS::TripleO::Services::Snmp