summaryrefslogtreecommitdiffstats
path: root/roles/openshift_builddefaults
diff options
context:
space:
mode:
Diffstat (limited to 'roles/openshift_builddefaults')
-rw-r--r--roles/openshift_builddefaults/tasks/main.yml1
-rw-r--r--roles/openshift_builddefaults/vars/main.yml16
2 files changed, 15 insertions, 2 deletions
diff --git a/roles/openshift_builddefaults/tasks/main.yml b/roles/openshift_builddefaults/tasks/main.yml
index 1f44b29b9..e0b51eee0 100644
--- a/roles/openshift_builddefaults/tasks/main.yml
+++ b/roles/openshift_builddefaults/tasks/main.yml
@@ -15,6 +15,7 @@
no_proxy: "{{ openshift_builddefaults_no_proxy | default(None) }}"
git_http_proxy: "{{ openshift_builddefaults_git_http_proxy | default(None) }}"
git_https_proxy: "{{ openshift_builddefaults_git_https_proxy | default(None) }}"
+ git_no_proxy: "{{ openshift_builddefaults_git_no_proxy | default(None) }}"
- name: Set builddefaults config structure
openshift_facts:
diff --git a/roles/openshift_builddefaults/vars/main.yml b/roles/openshift_builddefaults/vars/main.yml
index bcdf68112..c9ec3b82f 100644
--- a/roles/openshift_builddefaults/vars/main.yml
+++ b/roles/openshift_builddefaults/vars/main.yml
@@ -6,16 +6,28 @@ builddefaults_yaml:
kind: BuildDefaultsConfig
gitHTTPProxy: "{{ openshift.builddefaults.git_http_proxy | default('', true) }}"
gitHTTPSProxy: "{{ openshift.builddefaults.git_https_proxy | default('', true) }}"
+ gitNoProxy: "{{ openshift.builddefaults.git_no_proxy | default('', true) }}"
env:
- 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(',') }}"
+ value: "{{ openshift.builddefaults.no_proxy | default('', true) }}"
- 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(',') }}"
+ value: "{{ openshift.builddefaults.no_proxy | default('', true) }}"
+ imageLabels: "{{ openshift_builddefaults_image_labels | default(None) }}"
+ nodeSelector: "{{ openshift_builddefaults_nodeselectors | default(None) }}"
+ annotations: "{{ openshift_builddefaults_annotations | default(None) }}"
+ #resources: "{{ openshift.builddefaults.resources | default(None) }}"
+ resources:
+ requests:
+ cpu: "{{ openshift_builddefaults_resources_requests_cpu | default(None) }}"
+ memory: "{{ openshift_builddefaults_resources_requests_memory | default(None) }}"
+ limits:
+ cpu: "{{ openshift_builddefaults_resources_limits_cpu | default(None) }}"
+ memory: "{{ openshift_builddefaults_resources_limits_memory | default(None) }}"