Merge "Added kubelet root dir as parameter"

diff --git a/ansible/roles/kubelet/tasks/main.yml b/ansible/roles/kubelet/tasks/main.yml
index 6303b59..6188237 100644 (file)
--- a/ansible/roles/kubelet/tasks/main.yml
+++ b/ansible/roles/kubelet/tasks/main.yml
@@ -20,7 +20,7 @@
     name: "{{ item }}"
     state: directory
   with_items:
-    - /var/lib/kubelet
+    - "{{ caas.kubelet_root_directory }}"
     - /var/lib/cni
     - /etc/kubernetes/manifests
     - /etc/kubernetes/kubeconfig

diff --git a/ansible/roles/kubelet/templates/kubelet.service b/ansible/roles/kubelet/templates/kubelet.service
index 572dfc9..17c68bc 100644 (file)
--- a/ansible/roles/kubelet/templates/kubelet.service
+++ b/ansible/roles/kubelet/templates/kubelet.service
@@ -34,7 +34,7 @@ EnvironmentFile=/etc/kubernetes/env.list
 
 ExecStartPre={{ caas.libexec_dir }}/kubelet_start.sh
 
-ExecStart=/usr/bin/kubelet {{ kubelet_params | join(' ') }}
+ExecStart=/usr/bin/kubelet {{ kubelet_params | join(' ') }} --root-dir={{ caas.kubelet_root_directory }}
 
 ExecStop={{ caas.libexec_dir }}/kubelet_stop.sh
 

diff --git a/ansible/roles/kubelet/templates/kubelet_start.sh b/ansible/roles/kubelet/templates/kubelet_start.sh
index 97d0daa..227d83a 100644 (file)
--- a/ansible/roles/kubelet/templates/kubelet_start.sh
+++ b/ansible/roles/kubelet/templates/kubelet_start.sh
@@ -24,11 +24,11 @@ then
   kill -9 $kubeletpid
 fi
 
-for D in /var/lib/kubelet/pods/*
+for D in {{ caas.kubelet_root_directory }}/pods/*
 do
   if [ -d "${D}" ]
   then
-    rm -rf /var/lib/kubelet/pods/${D} || echo "Can not remove directory, skipping it"
+    rm -rf {{ caas.kubelet_root_directory }}/pods/${D} || echo "Can not remove directory, skipping it"
   fi
 done
 

diff --git a/ansible/roles/kubelet/templates/kubelet_stop.sh b/ansible/roles/kubelet/templates/kubelet_stop.sh
index 202c083..d735773 100644 (file)
--- a/ansible/roles/kubelet/templates/kubelet_stop.sh
+++ b/ansible/roles/kubelet/templates/kubelet_stop.sh
@@ -33,10 +33,10 @@ then
   kill -9 $kubeletpid
 fi
 
-for D in /var/lib/kubelet/pods/*
+for D in {{ caas.kubelet_root_directory }}/pods/*
 do
   if [ -d "${D}" ]
   then
-    rm -rf /var/lib/kubelet/pods/${D} || echo "Can not remove directory, skipping it"
+    rm -rf {{ caas.kubelet_root_directory }}/pods/${D} || echo "Can not remove directory, skipping it"
   fi
 done