소스 검색

Merge pull request #8670 from iamemilio/get_kuryr_services

Only Run Get Kuryr Services Task when cluster is running Kuryr
OpenShift Merge Robot 6 년 전
부모
커밋
363202bb65
1개의 변경된 파일4개의 추가작업 그리고 2개의 파일을 삭제
  1. 4 2
      roles/openshift_openstack/tasks/unprovision.yml

+ 4 - 2
roles/openshift_openstack/tasks/unprovision.yml

@@ -7,6 +7,8 @@
     all_namespaces: true
   register: svc_output
   ignore_errors: true
+  when:
+    - openshift_use_kuryr | default(false) | bool
 
 - name: Delete kuryr LoadBalancers (cascading)
   os_lbaas_deletion:
@@ -15,7 +17,7 @@
   when:
     - openshift_openstack_lbaasv2_provider == "Octavia"
     - not (item.metadata.name == "kubernetes")
-    - openshift_use_kuryr|default(false) == true
+    - openshift_use_kuryr | default(false) | bool
     - item.metadata.annotations is defined
 
 - name: Remove trunk subports
@@ -23,7 +25,7 @@
     trunk_name: "{{ item }}"
   with_items: "{{ groups['cluster_hosts'] }}"
   when:
-    - openshift_use_kuryr|default(false) == true
+    - openshift_use_kuryr | default(false) | bool
 
 - name: Delete the Stack
   ignore_errors: False