From 3e3787de15d1cd9f37b5f811c4f4710f0a429f9d Mon Sep 17 00:00:00 2001
From: Matthew Mosesohn <mmosesohn@mirantis.com>
Date: Thu, 2 Nov 2017 06:49:52 +0000
Subject: [PATCH] Fix local volume provisioner mount point for rkt
---
roles/kubernetes/node/templates/kubelet.rkt.service.j2 | 2 +-
roles/kubernetes/preinstall/tasks/main.yml | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/roles/kubernetes/node/templates/kubelet.rkt.service.j2 b/roles/kubernetes/node/templates/kubelet.rkt.service.j2
index f602319f2..4990bd7ee 100644
--- a/roles/kubernetes/node/templates/kubelet.rkt.service.j2
+++ b/roles/kubernetes/node/templates/kubelet.rkt.service.j2
@@ -32,7 +32,7 @@ ExecStart=/usr/bin/rkt run \
--volume etc-cni,kind=host,source=/etc/cni,readOnly=true \
--volume opt-cni,kind=host,source=/opt/cni,readOnly=true \
--volume var-lib-cni,kind=host,source=/var/lib/cni,readOnly=false \
- --volume local-volume-base-dir,target {{ local_volume_base_dir }},readOnly=false,recursive=true \
+ --volume local-volume-base-dir,kind=host,source={{ local_volume_base_dir }},readOnly=false,recursive=true \
--mount volume=etc-cni,target=/etc/cni \
--mount volume=opt-cni,target=/opt/cni \
--mount volume=var-lib-cni,target=/var/lib/cni \
diff --git a/roles/kubernetes/preinstall/tasks/main.yml b/roles/kubernetes/preinstall/tasks/main.yml
index 9b3f47084..738255efc 100644
--- a/roles/kubernetes/preinstall/tasks/main.yml
+++ b/roles/kubernetes/preinstall/tasks/main.yml
@@ -60,6 +60,7 @@
- "{{ kube_config_dir }}/ssl"
- "{{ kube_manifest_dir }}"
- "{{ kube_script_dir }}"
+ - "{{ local_volume_base_dir }}"
- name: check cloud_provider value
fail:
--
GitLab