summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-01-10 21:49:16 -0800
committerGitHub <noreply@github.com>2018-01-10 21:49:16 -0800
commitc5570478de299cb852c530183e8994edf828943c (patch)
tree4b3627e2e4d5bf1cae86fbab8bf6230b68df79e1
parent1e6c2b83a16e692d9abe4210a981ddddec662632 (diff)
parentf3e3f5dabe616aa07273fa91b6767bf756f41592 (diff)
downloadopenshift-c5570478de299cb852c530183e8994edf828943c.tar.gz
openshift-c5570478de299cb852c530183e8994edf828943c.tar.bz2
openshift-c5570478de299cb852c530183e8994edf828943c.tar.xz
openshift-c5570478de299cb852c530183e8994edf828943c.zip
Merge pull request #6579 from coreydaley/trello_1435_default_tolerations_via_buildconfig_defaulter
Automatic merge from submit-queue. Ability to specify default tolerations via the buildconfig defaulter Trello: https://trello.com/c/LNxlMjjU/1435-5-ability-to-specify-default-tolerations-via-the-buildconfig-defaulter-builds Dependent on: https://github.com/openshift/origin/pull/17955
-rw-r--r--inventory/hosts.example1
-rw-r--r--roles/openshift_buildoverrides/vars/main.yml1
2 files changed, 2 insertions, 0 deletions
diff --git a/inventory/hosts.example b/inventory/hosts.example
index 9064dc683..0563bd94e 100644
--- a/inventory/hosts.example
+++ b/inventory/hosts.example
@@ -909,6 +909,7 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
#openshift_buildoverrides_image_labels=[{'name':'imagelabelname1','value':'imagelabelvalue1'}]
#openshift_buildoverrides_nodeselectors={'nodelabel1':'nodelabelvalue1'}
#openshift_buildoverrides_annotations={'annotationkey1':'annotationvalue1'}
+#openshift_buildoverrides_tolerations=[{'key':'mykey1','value':'myvalue1','effect':'NoSchedule','operator':'Equal'}]
# Or you may optionally define your own build overrides configuration serialized as json
#openshift_buildoverrides_json='{"BuildOverrides":{"configuration":{"apiVersion":"v1","kind":"BuildDefaultsConfig","forcePull":"true"}}}'
diff --git a/roles/openshift_buildoverrides/vars/main.yml b/roles/openshift_buildoverrides/vars/main.yml
index cf49a6ebf..df53280c8 100644
--- a/roles/openshift_buildoverrides/vars/main.yml
+++ b/roles/openshift_buildoverrides/vars/main.yml
@@ -9,3 +9,4 @@ buildoverrides_yaml:
imageLabels: "{{ openshift_buildoverrides_image_labels | default(None) }}"
nodeSelector: "{{ openshift_buildoverrides_nodeselectors | default(None) }}"
annotations: "{{ openshift_buildoverrides_annotations | default(None) }}"
+ tolerations: "{{ openshift_buildoverrides_tolerations | default(None) }}"