瀏覽代碼

Merge pull request #8933 from mtnbikenc/fix-filter-warnings

Correct Jinja2 tests used as filters
OpenShift Merge Robot 6 年之前
父節點
當前提交
520e1c817e
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      playbooks/openshift-master/private/additional_config.yml
  2. 1 1
      roles/openshift_node/tasks/upgrade.yml

+ 1 - 1
playbooks/openshift-master/private/additional_config.yml

@@ -49,7 +49,7 @@
     when:
     when:
     - openshift_cloudprovider_kind is defined
     - openshift_cloudprovider_kind is defined
     - openshift_cloudprovider_kind == 'vsphere'
     - openshift_cloudprovider_kind == 'vsphere'
-    - openshift_version | version_compare('3.9', '>=')
+    - openshift_version is version_compare('3.9', '>=')
 
 
 - name: update vsphere provider master config
 - name: update vsphere provider master config
   hosts: oo_masters_to_config
   hosts: oo_masters_to_config

+ 1 - 1
roles/openshift_node/tasks/upgrade.yml

@@ -39,7 +39,7 @@
   with_items:
   with_items:
   - "/etc/cni/net.d/200-loopback.conf"
   - "/etc/cni/net.d/200-loopback.conf"
   - "/etc/cni/net.d/100-crio-bridge.conf"
   - "/etc/cni/net.d/100-crio-bridge.conf"
-  when: crio_update | changed
+  when: crio_update is changed
 
 
 - name: install pre-pulled rpms.
 - name: install pre-pulled rpms.
   import_tasks: upgrade/rpm_upgrade_install.yml
   import_tasks: upgrade/rpm_upgrade_install.yml