Bugfixes for docker-multinode

docker-multinode/cni-plugin.sh

@@ -32,6 +32,7 @@ kube::cni::ensure_docker_settings(){
     if [[ ! -z $(grep "MountFlags" ${DOCKER_CONF}) && -z $(grep "MountFlags=shared" ${DOCKER_CONF}) ]]; then
 
       # Make a dropin file for shared mounts, as /usr/lib isn't always writeable
+      mkdir -p /etc/systemd/system/docker.service.d
       cat > /etc/systemd/system/docker.service.d/shared-mounts.conf <<EOF
 [Service]
 MountFlags=

docker-multinode/common.sh

@@ -263,12 +263,12 @@ kube::multinode::turndown(){
 
   kube::log::status "Killing all kubernetes containers..."
 
-  if [[ $(docker ps | grep "k8s_" | awk '{print $1}' | wc -l) != 0 ]]; then
-    docker rm -f $(docker ps | grep "k8s_" | awk '{print $1}')
-  fi
   if [[ $(docker ps | grep "kube_" | awk '{print $1}' | wc -l) != 0 ]]; then
     docker rm -f $(docker ps | grep "kube_" | awk '{print $1}')
   fi
+  if [[ $(docker ps | grep "k8s_" | awk '{print $1}' | wc -l) != 0 ]]; then
+    docker rm -f $(docker ps | grep "k8s_" | awk '{print $1}')
+  fi
 
   if [[ -d /var/lib/kubelet ]]; then
     read -p "Do you want to clean /var/lib/kubelet? [Y/n] " clean_kubelet_dir

docker-multinode/worker.sh

@@ -25,7 +25,7 @@ fi
 
 kube::multinode::main
 
-kube::multinode::check_params
+kube::multinode::log_variables
 
 kube::multinode::install_network_utils