소스 검색

Merge pull request #2007 from bachp/lowercase-proxy-vars

Add lower case proxy variables
Scott Dodson 8 년 전
부모
커밋
fea08b9ba2
2개의 변경된 파일12개의 추가작업 그리고 0개의 파일을 삭제
  1. 6 0
      roles/openshift_builddefaults/vars/main.yml
  2. 6 0
      roles/openshift_master_facts/vars/main.yml

+ 6 - 0
roles/openshift_builddefaults/vars/main.yml

@@ -13,3 +13,9 @@ builddefaults_yaml:
         value: "{{ openshift.builddefaults.https_proxy | default('', true) }}"
       - name: NO_PROXY
         value: "{{ openshift.builddefaults.no_proxy | default('', true) | join(',') }}"
+      - name: http_proxy
+        value: "{{ openshift.builddefaults.http_proxy | default('', true) }}"
+      - name: https_proxy
+        value: "{{ openshift.builddefaults.https_proxy | default('', true) }}"
+      - name: no_proxy
+        value: "{{ openshift.builddefaults.no_proxy | default('', true) | join(',') }}"

+ 6 - 0
roles/openshift_master_facts/vars/main.yml

@@ -11,4 +11,10 @@ builddefaults_yaml:
       - name: HTTPS_PROXY
         value: "{{ openshift.master.builddefaults_https_proxy | default(omit, true) }}"
       - name: NO_PROXY
+        value: "{{ openshift.master.builddefaults_no_proxy | default(omit, true) | join(',') }}"
+      - name: http_proxy
+        value: "{{ openshift.master.builddefaults_http_proxy | default(omit, true) }}"
+      - name: https_proxy
+        value: "{{ openshift.master.builddefaults_https_proxy | default(omit, true) }}"
+      - name: no_proxy
         value: "{{ openshift.master.builddefaults_no_proxy | default(omit, true) | join(',') }}"