diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-01-17 10:32:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-17 10:32:42 -0500 |
| commit | def9d435ef60b1f11c29db2fc98fe266bbd4041d (patch) | |
| tree | 25bdfd52c8b76b2198bbc8d6a76e2d39ed9daae8 /roles/openshift_master_facts | |
| parent | 52860b6cdf48f0b74b0da13ad7d0663c663381d6 (diff) | |
| parent | 313f52af560af6b651e067d4b9f22b554a4e9cf7 (diff) | |
| download | openshift-def9d435ef60b1f11c29db2fc98fe266bbd4041d.tar.gz openshift-def9d435ef60b1f11c29db2fc98fe266bbd4041d.tar.bz2 openshift-def9d435ef60b1f11c29db2fc98fe266bbd4041d.tar.xz openshift-def9d435ef60b1f11c29db2fc98fe266bbd4041d.zip | |
Merge pull request #3086 from bparees/build_nodes
add configuration for build default+overrides settings
Diffstat (limited to 'roles/openshift_master_facts')
| -rw-r--r-- | roles/openshift_master_facts/vars/main.yml | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/roles/openshift_master_facts/vars/main.yml b/roles/openshift_master_facts/vars/main.yml index fa745eb66..bf6d2402d 100644 --- a/roles/openshift_master_facts/vars/main.yml +++ b/roles/openshift_master_facts/vars/main.yml @@ -2,24 +2,3 @@ openshift_master_config_dir: "{{ openshift.common.config_base }}/master" openshift_master_config_file: "{{ openshift_master_config_dir }}/master-config.yaml" openshift_master_scheduler_conf: "{{ openshift_master_config_dir }}/scheduler.json" - -builddefaults_yaml: - BuildDefaults: - configuration: - apiVersion: v1 - kind: BuildDefaultsConfig - gitHTTPProxy: "{{ openshift.master.builddefaults_git_http_proxy | default(omit, true) }}" - gitHTTPSProxy: "{{ openshift.master.builddefaults_git_https_proxy | default(omit, true) }}" - env: - - 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(',') }}" - - 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(',') }}" |