Remove workaround for docker installation
Engine was configured to install docker due to a bug in
Kubespray with Python 3 [1]. This has been solved and
we should let Kubespray handle docker installation.
[1] https://github.com/kubernetes-sigs/kubespray/issues/4300
Change-Id: Iaec2d1d3d7e6087db6bcb2fe7d4b801d1687abf3
diff --git a/playbooks/roles/configure-targethosts/defaults/main.yml b/playbooks/roles/configure-targethosts/defaults/main.yml
deleted file mode 100644
index ba124e6..0000000
--- a/playbooks/roles/configure-targethosts/defaults/main.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-# ============LICENSE_START=======================================================
-# Copyright (C) 2019 The Nordix Foundation. All rights reserved.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-# we need to pin docker version in order to avoid hitting the kubespray bug:
-# https://github.com/kubernetes-sigs/kubespray/issues/4300
-docker_ce_version: "{{ lookup('env', 'DOCKER_CE_VERSION') | default('18.06.2~ce~3-0~ubuntu', true) }}"
-
-# vim: set ts=2 sw=2 expandtab:
diff --git a/playbooks/roles/configure-targethosts/tasks/install-packages-Debian.yml b/playbooks/roles/configure-targethosts/tasks/install-packages-Debian.yml
index a01a2ab..9abd870 100644
--- a/playbooks/roles/configure-targethosts/tasks/install-packages-Debian.yml
+++ b/playbooks/roles/configure-targethosts/tasks/install-packages-Debian.yml
@@ -31,27 +31,4 @@
- "chrony"
- "dbus"
-# docker stuff here is put in place temporarily in order to
-# avoid hitting the kubespray bug:
-# https://github.com/kubernetes-sigs/kubespray/issues/4300
-- name: Add docker official gpg key
- apt_key:
- url: "https://download.docker.com/linux/ubuntu/gpg"
- state: present
-
-- name: Add docker apt repository
- apt_repository:
- repo: "deb [arch=amd64] https://download.docker.com/linux/ubuntu {{ ansible_lsb.codename }} stable"
- state: present
-
-- name: Install docker version {{ docker_ce_version }}
- apt:
- name: "{{ item }}"
- state: present
- update_cache: true
- allow_unauthenticated: true
- with_items:
- - "docker-ce={{ docker_ce_version }}"
- - "containerd.io"
-
# vim: set ts=2 sw=2 expandtab:
diff --git a/playbooks/roles/configure-targethosts/tasks/main.yml b/playbooks/roles/configure-targethosts/tasks/main.yml
index 6bed1a0..523849a 100644
--- a/playbooks/roles/configure-targethosts/tasks/main.yml
+++ b/playbooks/roles/configure-targethosts/tasks/main.yml
@@ -25,13 +25,4 @@
- include: install-packages.yml
- include: sync-time.yml
-# docker stuff here is put in place temporarily in order to
-# avoid hitting the kubespray bug:
-# https://github.com/kubernetes-sigs/kubespray/issues/4300
-- name: Enable and start docker service
- service:
- name: docker
- state: restarted
- enabled: true
-
# vim: set ts=2 sw=2 expandtab: