From d4c61d262877dee443a7239878745078e0f2681c Mon Sep 17 00:00:00 2001
From: Wong Hoi Sing Edison <hswong3i@gmail.com>
Date: Mon, 19 Feb 2018 16:43:18 +0800
Subject: [PATCH] Fixup for gce_centos7-flannel-addons
---
inventory/sample/group_vars/k8s-cluster.yml | 4 ++--
roles/kubernetes/preinstall/tasks/main.yml | 10 +---------
2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/inventory/sample/group_vars/k8s-cluster.yml b/inventory/sample/group_vars/k8s-cluster.yml
index 8ea6e27ca..af493beca 100644
--- a/inventory/sample/group_vars/k8s-cluster.yml
+++ b/inventory/sample/group_vars/k8s-cluster.yml
@@ -171,8 +171,8 @@ registry_enabled: false
# Local volume provisioner deployment
local_volume_provisioner_enabled: false
# local_volume_provisioner_namespace: "{{ system_namespace }}"
-# local_volume_provisioner_base_dir: /mnt/disks
-# local_volume_provisioner_mount_dir: /local-disks
+local_volume_provisioner_base_dir: /mnt/disks
+local_volume_provisioner_mount_dir: /mnt/disks
# local_volume_provisioner_storage_class: local-storage
# CephFS provisioner deployment
diff --git a/roles/kubernetes/preinstall/tasks/main.yml b/roles/kubernetes/preinstall/tasks/main.yml
index 76f9bfde4..24e839806 100644
--- a/roles/kubernetes/preinstall/tasks/main.yml
+++ b/roles/kubernetes/preinstall/tasks/main.yml
@@ -60,15 +60,7 @@
- "{{ kube_config_dir }}/ssl"
- "{{ kube_manifest_dir }}"
- "{{ kube_script_dir }}"
-
-- name: Create local volume provisioner base dir
- file:
- path: "{{ local_volume_provisioner_base_dir }}"
- state: directory
- owner: kube
- when:
- - inventory_hostname in groups['k8s-cluster']
- - local_volume_provisioner_enabled == true
+ - "{{ local_volume_provisioner_base_dir }}"
- name: check cloud_provider value
fail:
--
GitLab