瀏覽代碼

Remove system_container image from openshift_cli

We don't need to account for system_container masters
anymore.
Michael Gugino 7 年之前
父節點
當前提交
32ea37db44
共有 1 個文件被更改,包括 1 次插入2 次删除
  1. 1 2
      roles/openshift_cli/defaults/main.yml

+ 1 - 2
roles/openshift_cli/defaults/main.yml

@@ -22,5 +22,4 @@ system_openshift_cli_image: "{{ (system_images_registry == 'docker') | ternary('
 openshift_use_crio_only: False
 openshift_crio_use_rpm: False
 
-l_is_system_container_image: "{{ openshift_use_master_system_container | default(openshift_use_system_containers | default(False)) | bool }}"
-l_use_cli_atomic_image: "{{ (openshift_use_crio_only | bool and not openshift_crio_use_rpm | bool) or (l_is_system_container_image | bool) }}"
+l_use_cli_atomic_image: "{{ (openshift_use_crio_only | bool and not openshift_crio_use_rpm | bool) }}"