소스 검색

Remove invalid when: from vars:

Russell Teague 8 년 전
부모
커밋
8e3ddd2418
1개의 변경된 파일1개의 추가작업 그리고 4개의 파일을 삭제
  1. 1 4
      playbooks/common/openshift-node/config.yml

+ 1 - 4
playbooks/common/openshift-node/config.yml

@@ -47,8 +47,7 @@
                                                     | union(groups['oo_etcd_to_config'] | default([])))
                                                     | union(groups['oo_etcd_to_config'] | default([])))
                                                 | oo_collect('openshift.common.hostname') | default([]) | join (',')
                                                 | oo_collect('openshift.common.hostname') | default([]) | join (',')
                                                 }}"
                                                 }}"
-    when: "{{ (openshift_http_proxy is defined or openshift_https_proxy is defined) and
-            openshift_generate_no_proxy_hosts | default(True) | bool }}"
+
   roles:
   roles:
   - role: openshift_node
   - role: openshift_node
     openshift_ca_host: "{{ groups.oo_first_master.0 }}"
     openshift_ca_host: "{{ groups.oo_first_master.0 }}"
@@ -64,8 +63,6 @@
                                                     | union(groups['oo_etcd_to_config'] | default([])))
                                                     | union(groups['oo_etcd_to_config'] | default([])))
                                                 | oo_collect('openshift.common.hostname') | default([]) | join (',')
                                                 | oo_collect('openshift.common.hostname') | default([]) | join (',')
                                                 }}"
                                                 }}"
-    when: "{{ (openshift_http_proxy is defined or openshift_https_proxy is defined) and
-            openshift_generate_no_proxy_hosts | default(True) | bool }}"
   roles:
   roles:
   - role: openshift_node
   - role: openshift_node
     openshift_ca_host: "{{ groups.oo_first_master.0 }}"
     openshift_ca_host: "{{ groups.oo_first_master.0 }}"