diff options
| author | Andrew Butcher <abutcher@afrolegs.com> | 2016-12-05 17:28:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-05 17:28:31 -0500 |
| commit | a3ce4c106304773b6002458dfb113de9fd36efde (patch) | |
| tree | 7a777ea5e83300f22d2fdf838ef675dd8271c5f2 /roles/openshift_master | |
| parent | 49ad2e283c7ed68e83c5d8f2ad7e89a189833cbd (diff) | |
| parent | 3094794acf9e9441b3333b0149c555a3d493a218 (diff) | |
| download | openshift-a3ce4c106304773b6002458dfb113de9fd36efde.tar.gz openshift-a3ce4c106304773b6002458dfb113de9fd36efde.tar.bz2 openshift-a3ce4c106304773b6002458dfb113de9fd36efde.tar.xz openshift-a3ce4c106304773b6002458dfb113de9fd36efde.zip | |
Merge pull request #2920 from detiber/schedulerVarFix
Scheduler var fix
Diffstat (limited to 'roles/openshift_master')
| -rw-r--r-- | roles/openshift_master/vars/main.yml | 8 |
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 |