From 48b1cfd61e2eb481157f37e5e61736547c6e8de0 Mon Sep 17 00:00:00 2001
From: Jiri Stransky <jistr@redhat.com>
Date: Thu, 19 Oct 2017 18:09:06 +0200
Subject: [PATCH] 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
---
 extraconfig/services/kubernetes-master.yaml | 25 ++++-----------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/extraconfig/services/kubernetes-master.yaml b/extraconfig/services/kubernetes-master.yaml
index 0f61c2d83a..833e28f6b7 100644
--- a/extraconfig/services/kubernetes-master.yaml
+++ b/extraconfig/services/kubernetes-master.yaml
@@ -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}}