summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/vars
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2016-11-23 16:57:37 -0500
committerJason DeTiberus <jdetiber@redhat.com>2016-11-29 12:47:18 -0500
commit81d8b6a835de79f18b2cae87b7b58ba4d02f0b14 (patch)
treecd4ffc636a782614c5754ef327959192ec96bac4 /roles/openshift_master/vars
parentcef42e2541f7ddeaf284b1350eed7f4e46234fe9 (diff)
downloadopenshift-81d8b6a835de79f18b2cae87b7b58ba4d02f0b14.tar.gz
openshift-81d8b6a835de79f18b2cae87b7b58ba4d02f0b14.tar.bz2
openshift-81d8b6a835de79f18b2cae87b7b58ba4d02f0b14.tar.xz
openshift-81d8b6a835de79f18b2cae87b7b58ba4d02f0b14.zip
refactor handling of scheduler defaults
Diffstat (limited to 'roles/openshift_master/vars')
-rw-r--r--roles/openshift_master/vars/main.yml7
1 files changed, 2 insertions, 5 deletions
diff --git a/roles/openshift_master/vars/main.yml b/roles/openshift_master/vars/main.yml
index 7c1d5a212..4dce63630 100644
--- a/roles/openshift_master/vars/main.yml
+++ b/roles/openshift_master/vars/main.yml
@@ -1,17 +1,14 @@
---
-openshift_master_config_dir: "{{ openshift.common.config_base }}/master"
-openshift_master_config_file: "{{ openshift_master_config_dir }}/master-config.yaml"
openshift_master_loopback_config: "{{ openshift_master_config_dir }}/openshift-master.kubeconfig"
loopback_context_string: "current-context: {{ openshift.master.loopback_context_name }}"
-openshift_master_scheduler_conf: "{{ openshift_master_config_dir }}/scheduler.json"
openshift_master_session_secrets_file: "{{ openshift_master_config_dir }}/session-secrets.yaml"
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 }}"
+ priorities: "{{ openshift_master_scheduler_priorities }}"
openshift_master_valid_grant_methods:
- auto