openstack/tripleo-heat-templates
Code Issues Proposed changes

OpenShift: Don't pre-install Docker

Browse Source 
We installed docker our traditional way when deploying with Kubespray
and disabled Kubespray's management of Docker, because Kubespray
installs non-CentOS Docker binaries.

However, openshift-ansible installs Docker from CentOS, we don't need
to install it using the Docker composable service too. That way
openshift-ansible will be the authority on Docker configuration when
deploying OpenShift.

Change-Id: I1352d4050e2f38300068d858b19e0b4a31cf50a7
Related-Bug: #1741224
This commit is contained in:
Jiri Stransky 2018-01-11 14:40:43 +01:00 committed by Bogdan Dobrelya
parent 2ebc2ee3af
commit e2c18c34ec
1 changed files with 1 additions and 3 deletions

4
ci/environments/scenario009-multinode.yaml

@ -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