x/k8s-docker-suite-app-murano
Code Issues Proposed changes

Revert "Apply custom cidr configuration for docker0 for master k8s node"

Browse Source 
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 6547024fa3.

Change-Id: Ic522d54b14ade7878ce2c6b5729c1e117c329551
This commit is contained in:
Dmytro Dovbii 2016-09-15 15:27:41 +03:00
parent 493ce1927f
commit 41ed47a183
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Kubernetes/KubernetesCluster/package/Resources/KubeMasterSetup.template
View File

@ -41,7 +41,6 @@ Scripts:
- systemd/kube-apiserver.service - systemd/kube-apiserver.service
- systemd/kube-scheduler.service - systemd/kube-scheduler.service
- systemd/kube-controller-manager.service - systemd/kube-controller-manager.service
- systemd/docker.service
Options: Options:

7
Kubernetes/KubernetesCluster/package/Resources/scripts/master-kube-setup.sh
View File

@ -7,13 +7,6 @@
mkdir -p /var/run/murano-kubernetes mkdir -p /var/run/murano-kubernetes
if [[ $(which systemctl) ]]; then 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* systemctl stop kube*
sed -i.bak "s/%%MASTER_IP%%/$2/g" environ/kube-config sed -i.bak "s/%%MASTER_IP%%/$2/g" environ/kube-config