From 41ed47a183b562df9408b593cb3e723aadb3f593 Mon Sep 17 00:00:00 2001 From: Dmytro Dovbii Date: Thu, 15 Sep 2016 15:27:41 +0300 Subject: [PATCH] Revert "Apply custom cidr configuration for docker0 for master k8s node" This commit does not resolve a bug with docker0 due to the fact that murano-agent is unable to execute script for reconfiguration So, this patch reverts commit 6547024fa3947a65c74ee5a00140e5a8a9398437. Change-Id: Ic522d54b14ade7878ce2c6b5729c1e117c329551 --- .../package/Resources/KubeMasterSetup.template | 1 - .../package/Resources/scripts/master-kube-setup.sh | 7 ------- 2 files changed, 8 deletions(-) diff --git a/Kubernetes/KubernetesCluster/package/Resources/KubeMasterSetup.template b/Kubernetes/KubernetesCluster/package/Resources/KubeMasterSetup.template index a347fd3..af5965b 100644 --- a/Kubernetes/KubernetesCluster/package/Resources/KubeMasterSetup.template +++ b/Kubernetes/KubernetesCluster/package/Resources/KubeMasterSetup.template @@ -41,7 +41,6 @@ Scripts: - systemd/kube-apiserver.service - systemd/kube-scheduler.service - systemd/kube-controller-manager.service - - systemd/docker.service Options: diff --git a/Kubernetes/KubernetesCluster/package/Resources/scripts/master-kube-setup.sh b/Kubernetes/KubernetesCluster/package/Resources/scripts/master-kube-setup.sh index 63e9e69..74e3596 100644 --- a/Kubernetes/KubernetesCluster/package/Resources/scripts/master-kube-setup.sh +++ b/Kubernetes/KubernetesCluster/package/Resources/scripts/master-kube-setup.sh @@ -7,13 +7,6 @@ mkdir -p /var/run/murano-kubernetes if [[ $(which systemctl) ]]; then - # On debian docker ignores /etc/default/docker file - # Replacing original docker.service to modified with EnvironmentFile option - systemctl stop docker - cp -f systemd/docker.service /lib/systemd/system/ - systemctl daemon-reload - systemctl start docker - systemctl stop kube* sed -i.bak "s/%%MASTER_IP%%/$2/g" environ/kube-config