From 313f52af560af6b651e067d4b9f22b554a4e9cf7 Mon Sep 17 00:00:00 2001
From: Ben Parees <bparees@redhat.com>
Date: Fri, 6 Jan 2017 14:07:51 -0500
Subject: add configuration for build default+overrides settings
---
roles/openshift_master_facts/vars/main.yml | 21 ---------------------
1 file changed, 21 deletions(-)
(limited to 'roles/openshift_master_facts')
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(',') }}"
--
cgit v1.2.3