Don't alter default docker configuration during kubernetes install

Previously we've overriden the MountFlags option to 'shared' for
Kubernetes installation. This is no longer needed when Kubespray
deploys kubelet non-containerized.

Change-Id: I20b0f4bd6d99941a0a1876e68420cffd35f3ccfe
This commit is contained in:
Jiri Stransky 2017-10-19 18:09:06 +02:00
parent 215515e788
commit 48b1cfd61e
1 changed files with 4 additions and 21 deletions

View File

@ -106,30 +106,13 @@ outputs:
copy:
dest: "{{playbook_dir}}/kubespray/playbook.yml"
content: |
# NOTE: We could let kubespray configure docker and
# run it in step 1 when this RFE is implemented:
# https://github.com/kubernetes-incubator/kubespray/issues/1836
- name: Configure existing docker
gather_facts: false
hosts: k8s-cluster
tasks:
# NOTE(flaper87): These steps configure docker with
# MountFlags=shared, which is required by kubespray
- name: Create docker service systemd directory
file:
path: /etc/systemd/system/docker.service.d
state: directory
- name: Set mount propagation options for docker
ini_file: dest=/etc/systemd/system/docker.service.d/clear_mount_propagtion_flags.conf section=Service option=MountFlags value=shared
- name : Docker | reload systemd
shell: systemctl daemon-reload
- name: Docker | reload docker
service:
name: docker
state: restarted
- include: /usr/share/kubespray/cluster.yml
- name: set kubespray command
set_fact:
# NOTE: We could let kubespray configure docker
# (remove --skip-tags docker) and run it in step 1
# when this RFE is implemented:
# https://github.com/kubernetes-incubator/kubespray/issues/1836
kubespray_command: >-
{%- if kubespray_command is defined -%}
{{kubespray_command}}