From e9a676951bcaccaa3618ed540a4d2f1e1675b940 Mon Sep 17 00:00:00 2001
From: Erwan Miran <mirwan666@gmail.com>
Date: Fri, 9 Feb 2018 00:11:07 +0100
Subject: [PATCH] storageClass name template as suggested by @eyeofthefrog
---
.../local_volume_provisioner/templates/configmap.yml.j2 | 2 +-
roles/kubespray-defaults/defaults/main.yaml | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
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 aa8476fd4..fd8a7a637 100644
--- a/roles/kubernetes-apps/local_volume_provisioner/templates/configmap.yml.j2
+++ b/roles/kubernetes-apps/local_volume_provisioner/templates/configmap.yml.j2
@@ -7,7 +7,7 @@ metadata:
name: local-volume-config
namespace: {{ system_namespace }}
data:
- "local-storage": |
+ "{{ local_volume_storage_class }}": |
{
"hostDir": "{{ local_volume_base_dir }}",
"mountDir": "{{ local_volume_mount_dir }}"
diff --git a/roles/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml
index 0f4cc90ce..63aaeb85a 100644
--- a/roles/kubespray-defaults/defaults/main.yaml
+++ b/roles/kubespray-defaults/defaults/main.yaml
@@ -170,6 +170,7 @@ persistent_volumes_enabled: false
# Base path for local volume provisioner addon
local_volume_base_dir: /mnt/disks
local_volume_mount_dir: /local-disks
+local_volume_storage_class: local-storage
## 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