summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/vars
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2016-12-01 16:12:32 -0500
committerJason DeTiberus <jdetiber@redhat.com>2016-12-01 16:12:37 -0500
commit3094794acf9e9441b3333b0149c555a3d493a218 (patch)
tree9c5074dae269a2f8bfbd3bf214d375232a123cdd /roles/openshift_master/vars
parent1aeb8fe2e4fc2c3ea44af0055debac2f5a949849 (diff)
downloadopenshift-3094794acf9e9441b3333b0149c555a3d493a218.tar.gz
openshift-3094794acf9e9441b3333b0149c555a3d493a218.tar.bz2
openshift-3094794acf9e9441b3333b0149c555a3d493a218.tar.xz
openshift-3094794acf9e9441b3333b0149c555a3d493a218.zip
Update scheduler predicate/priorities vars
- Introduce additional variables for current scheduler config and default values to better determine if the values we are getting are user-defined, coming from config or are the default values.
Diffstat (limited to 'roles/openshift_master/vars')
-rw-r--r--roles/openshift_master/vars/main.yml8
1 files changed, 6 insertions, 2 deletions
diff --git a/roles/openshift_master/vars/main.yml b/roles/openshift_master/vars/main.yml
index 4dce63630..01cd28c66 100644
--- a/roles/openshift_master/vars/main.yml
+++ b/roles/openshift_master/vars/main.yml
@@ -7,8 +7,12 @@ openshift_master_policy: "{{ openshift_master_config_dir }}/policy.json"
scheduler_config:
kind: Policy
apiVersion: v1
- predicates: "{{ openshift_master_scheduler_predicates }}"
- priorities: "{{ openshift_master_scheduler_priorities }}"
+ predicates: "{{ openshift_master_scheduler_predicates
+ | default(openshift_master_scheduler_current_predicates
+ | default(openshift_master_scheduler_default_predicates)) }}"
+ priorities: "{{ openshift_master_scheduler_priorities
+ | default(openshift_master_scheduler_current_priorities
+ | default(openshift_master_scheduler_default_priorities)) }}"
openshift_master_valid_grant_methods:
- auto