diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-11-29 16:39:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-29 16:39:32 -0500 |
| commit | e4a010aa08356e10fab9e9a4904dbd8491a74b8f (patch) | |
| tree | d146f1e12c8efb25fac17eff70e5e38d8d7db511 /roles/openshift_master/vars | |
| parent | f5a8207ad149fe8e67621b0b8fb585a48b3a1ca0 (diff) | |
| parent | 81d8b6a835de79f18b2cae87b7b58ba4d02f0b14 (diff) | |
| download | openshift-e4a010aa08356e10fab9e9a4904dbd8491a74b8f.tar.gz openshift-e4a010aa08356e10fab9e9a4904dbd8491a74b8f.tar.bz2 openshift-e4a010aa08356e10fab9e9a4904dbd8491a74b8f.tar.xz openshift-e4a010aa08356e10fab9e9a4904dbd8491a74b8f.zip | |
Merge pull request #2855 from detiber/updateSchedulerDefaults
Update scheduler defaults
Diffstat (limited to 'roles/openshift_master/vars')
| -rw-r--r-- | roles/openshift_master/vars/main.yml | 7 |
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 |