From abfb147292dfbe041386e33c92aec91a28d55452 Mon Sep 17 00:00:00 2001
From: Erwan Miran <mirwan666@gmail.com>
Date: Wed, 7 Feb 2018 18:42:42 +0100
Subject: [PATCH] MountDir in configmap and daemonset must be the same
---
.../local_volume_provisioner/templates/configmap.yml.j2 | 2 +-
.../local_volume_provisioner/templates/daemonset.yml.j2 | 2 +-
roles/kubespray-defaults/defaults/main.yaml | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/roles/kubernetes-apps/local_volume_provisioner/templates/configmap.yml.j2 b/roles/kubernetes-apps/local_volume_provisioner/templates/configmap.yml.j2
index fc6d829a8..aa8476fd4 100644
--- a/roles/kubernetes-apps/local_volume_provisioner/templates/configmap.yml.j2
+++ b/roles/kubernetes-apps/local_volume_provisioner/templates/configmap.yml.j2
@@ -10,5 +10,5 @@ data:
"local-storage": |
{
"hostDir": "{{ local_volume_base_dir }}",
- "mountDir": "/mnt/local-storage/"
+ "mountDir": "{{ local_volume_mount_dir }}"
}
diff --git a/roles/kubernetes-apps/local_volume_provisioner/templates/daemonset.yml.j2 b/roles/kubernetes-apps/local_volume_provisioner/templates/daemonset.yml.j2
index 401bce4a5..d4f8b73ea 100644
--- a/roles/kubernetes-apps/local_volume_provisioner/templates/daemonset.yml.j2
+++ b/roles/kubernetes-apps/local_volume_provisioner/templates/daemonset.yml.j2
@@ -18,7 +18,7 @@ spec:
privileged: true
volumeMounts:
- name: discovery-vol
- mountPath: "/local-disks"
+ mountPath: "/{{ local_volume_mount_dir }}"
- name: local-volume-config
mountPath: /etc/provisioner/config/
env:
diff --git a/roles/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml
index fd13417eb..0f4cc90ce 100644
--- a/roles/kubespray-defaults/defaults/main.yaml
+++ b/roles/kubespray-defaults/defaults/main.yaml
@@ -169,6 +169,7 @@ persistent_volumes_enabled: false
# Base path for local volume provisioner addon
local_volume_base_dir: /mnt/disks
+local_volume_mount_dir: /local-disks
## When OpenStack is used, Cinder version can be explicitly specified if autodetection fails (Fixed in 1.9: https://github.com/kubernetes/kubernetes/issues/50461)
# openstack_blockstorage_version: "v1/v2/auto (default)"
--
GitLab