[#682] update condition

legion-platform · Dec 27, 2018 · 64d7adc · 64d7adc
1 parent bc43d20
commit 64d7adc
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/deploy/ansible/roles/k8s_resources/tasks/k8s-authenticator.yaml b/deploy/ansible/roles/k8s_resources/tasks/k8s-authenticator.yaml
@@ -55,10 +55,13 @@
   when: dex.enabled
   tags: k8s-authenticator
 
+- name: show helm_local_src var
+  msg: "local helm is {{ helm_local_src }}"
+
 # OR install charts from local soures in case of debug flag
 - name: Install k8s-authenticator
   command: "helm --kube-context {{ cluster_name }} install k8s-authenticator --name k8s-authenticator --namespace kube-system -f {{ tmp_dir }}/k8s-authenticator.{{ cluster_name }}.yml"
-  when: dex.enabled and  "{{ helm_local_src == 'true' }}"
+  when: dex is enabled and  helm_local_src == 'true'
   tags: k8s-authenticator
   args:
     chdir: ../helms
diff --git a/deploy/ansible/roles/k8s_resources/tasks/kube-elb-security.yaml b/deploy/ansible/roles/k8s_resources/tasks/kube-elb-security.yaml
@@ -13,10 +13,13 @@
   when: dex.enabled and helm_kube_elb_security_status.stdout.find("DEPLOYED") == -1
   tags: dex
 
+- name: show helm_local_src var
+  msg: "local helm is {{ helm_local_src }}"
+
 # OR install charts from local soures in case of debug flag
 - name: Install Kube-elb-security
   command: "helm --kube-context {{ cluster_name }} install kube-elb-security --name kube-elb-security --namespace kube-system --set image.repository={{ docker_repo }}/kube-elb-security --set iam_role=masters.{{ cluster_name }},image.repository={{ docker_repo }}/k8s-kube-elb-security,image.tag={{ legion_version }} --wait"
-  when: dex.enabled and helm_kube_elb_security_status.stdout.find("DEPLOYED") == -1 and  "{{ helm_local_src == 'true' }}"
+  when: dex is enabled and helm_kube_elb_security_status.stdout.find("DEPLOYED") == -1 and helm_local_src == 'true'
   tags: dex
   args:
     chdir: ../helms
diff --git a/deploy/ansible/roles/k8s_resources/tasks/kube-fluentd.yaml b/deploy/ansible/roles/k8s_resources/tasks/kube-fluentd.yaml
@@ -74,9 +74,12 @@
 - name: Install kube-fluentd chart
   shell: helm --kube-context {{ cluster_name }} install legion-helm/kube-fluentd --name kube-fluentd --version={{ legion_version }} --namespace=kube-system --wait --timeout 600 -f  {{ tmp_dir }}/fluentd-values.{{ cluster_name }}.yaml
 
+- name: show helm_local_src var
+  msg: "local helm is {{ helm_local_src }}"
+
 # OR install charts from local soures in case of debug flag
 - name: Install kube-fluentd chart
   shell: helm --kube-context {{ cluster_name }} install kube-fluentd --name kube-fluentd --namespace=kube-system --wait --timeout 600 -f  {{ tmp_dir }}/fluentd-values.{{ cluster_name }}.yaml
   args:
     chdir: ../helms
-  when:  "{{ helm_local_src == 'true' }}"
+  when: helm_local_src == 'true'
diff --git a/deploy/ansible/roles/k8s_resources/tasks/oauth2-proxy.yaml b/deploy/ansible/roles/k8s_resources/tasks/oauth2-proxy.yaml
@@ -17,9 +17,12 @@
   command: "helm --kube-context {{ cluster_name }} install legion-helm/oauth2-proxy --name dex-oauth2-proxy --version={{ legion_version }} --namespace kube-system -f {{ tmp_dir }}/oauth2-proxy.{{ cluster_name }}.yml"
   when: dex.enabled
 
+- name: show helm_local_src var
+  msg: "local helm is {{ helm_local_src }}"
+
 # OR install charts from local soures in case of debug flag
 - name: Install Dex oauth2-proxy
   command: "helm --kube-context {{ cluster_name }} install oauth2-proxy --name dex-oauth2-proxy --namespace kube-system -f {{ tmp_dir }}/oauth2-proxy.{{ cluster_name }}.yml"
-  when: dex.enabled and  "{{ helm_local_src == 'true' }}"
+  when: dex is enabled and helm_local_src == 'true'
   args:
     chdir: ../helms