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

Apply custom cidr configuration for docker0 for master k8s node

Browse Source 
Change-Id: Id47c3d4548f1556280b9663a6176205bf0d3b051
Closes-Bug: #1590070
This commit is contained in:
Dmytro Dovbii 2016-09-14 15:47:22 +03:00
parent 957ccc99b4
commit 6547024fa3
2 changed files with 8 additions and 0 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,6 +41,7 @@ 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,6 +7,13 @@
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