From a4d142368bbda46f33c86258bcffd3baec26fdbc Mon Sep 17 00:00:00 2001
From: Virgil Chereches <virgil.chereches@gmail.com>
Date: Tue, 23 Jan 2018 13:14:00 +0000
Subject: [PATCH] Renamed variable from disable_volume_zone_conflict to
 volume_cross_zone_attachment and removed cloud provider condition; fix
 identation

---
 inventory/group_vars/k8s-cluster.yml                        | 2 +-
 roles/kubernetes/master/defaults/main.yml                   | 2 +-
 roles/kubernetes/master/tasks/static-pod-setup.yml          | 4 ++--
 .../master/templates/manifests/kube-scheduler.manifest.j2   | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/inventory/group_vars/k8s-cluster.yml b/inventory/group_vars/k8s-cluster.yml
index b925f5d7a..c50041db2 100644
--- a/inventory/group_vars/k8s-cluster.yml
+++ b/inventory/group_vars/k8s-cluster.yml
@@ -183,4 +183,4 @@ local_volumes_enabled: false
 ## Running on top of openstack vms with cinder enabled may lead to unschedulable pods due to NoVolumeZoneConflict restriction in kube-scheduler.
 ## See https://github.com/kubernetes-incubator/kubespray/issues/2141
 ## Set this variable to true to get rid of this issue
-disable_volume_zone_conflict: false
+volume_cross_zone_attachment: false
diff --git a/roles/kubernetes/master/defaults/main.yml b/roles/kubernetes/master/defaults/main.yml
index 4615591a7..da1a1cced 100644
--- a/roles/kubernetes/master/defaults/main.yml
+++ b/roles/kubernetes/master/defaults/main.yml
@@ -82,4 +82,4 @@ scheduler_custom_flags: []
 kubeadm_token_ttl: 0
 
 ## Variable for influencing kube-scheduler behaviour
-disable_volume_zone_conflict: false
+volume_cross_zone_attachment: false
diff --git a/roles/kubernetes/master/tasks/static-pod-setup.yml b/roles/kubernetes/master/tasks/static-pod-setup.yml
index 151f7ad54..e8308798f 100644
--- a/roles/kubernetes/master/tasks/static-pod-setup.yml
+++ b/roles/kubernetes/master/tasks/static-pod-setup.yml
@@ -11,8 +11,8 @@
 
 - name: Write kube-scheduler policy file
   template:
-     src: kube-scheduler-policy.yaml.j2
-     dest: "{{ kube_config_dir }}/kube-scheduler-policy.yaml"
+    src: kube-scheduler-policy.yaml.j2
+    dest: "{{ kube_config_dir }}/kube-scheduler-policy.yaml"
   tags:
     - kube-scheduler
 
diff --git a/roles/kubernetes/master/templates/manifests/kube-scheduler.manifest.j2 b/roles/kubernetes/master/templates/manifests/kube-scheduler.manifest.j2
index 7b7c2b804..b13fc7fa3 100644
--- a/roles/kubernetes/master/templates/manifests/kube-scheduler.manifest.j2
+++ b/roles/kubernetes/master/templates/manifests/kube-scheduler.manifest.j2
@@ -28,7 +28,7 @@ spec:
     - scheduler
     - --leader-elect=true
     - --kubeconfig={{ kube_config_dir }}/kube-scheduler-kubeconfig.yaml
-{% if cloud_provider == 'openstack' and disable_volume_zone_conflict %}
+{% if volume_cross_zone_attachment %}
     - --policy-config-file={{ kube_config_dir }}/kube-scheduler-policy.yaml
 {% endif %}
     - --profiling=false
@@ -65,7 +65,7 @@ spec:
     - mountPath: "{{ kube_config_dir }}/kube-scheduler-kubeconfig.yaml"
       name: kubeconfig
       readOnly: true
-{% if cloud_provider == 'openstack' and disable_volume_zone_conflict %}
+{% if volume_cross_zone_attachment %}
     - mountPath: "{{ kube_config_dir }}/kube-scheduler-policy.yaml"
       name: kube-scheduler-policy
       readOnly: true
@@ -85,7 +85,7 @@ spec:
   - name: kubeconfig
     hostPath:
       path: "{{ kube_config_dir }}/kube-scheduler-kubeconfig.yaml"
-{% if cloud_provider == 'openstack' and disable_volume_zone_conflict %}
+{% if volume_cross_zone_attachment %}
   - name: kube-scheduler-policy
     hostPath:
       path: "{{ kube_config_dir }}/kube-scheduler-policy.yaml"