diff options
author | Jan Safranek <jsafrane@redhat.com> | 2017-09-20 16:22:19 +0200 |
---|---|---|
committer | Jan Safranek <jsafrane@redhat.com> | 2017-09-20 16:22:19 +0200 |
commit | ce7061a316834b15752fc03feeeb387a487af51f (patch) | |
tree | fc315554971edc6bdedf552c89e246f6aef85fa9 /roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_predicates.py | |
parent | af580f808d78667bde54b88d4c33fca493828945 (diff) | |
download | openshift-ce7061a316834b15752fc03feeeb387a487af51f.tar.gz openshift-ce7061a316834b15752fc03feeeb387a487af51f.tar.bz2 openshift-ce7061a316834b15752fc03feeeb387a487af51f.tar.xz openshift-ce7061a316834b15752fc03feeeb387a487af51f.zip |
Add 3.7 scheduler predicates
Diffstat (limited to 'roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_predicates.py')
-rw-r--r-- | roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_predicates.py | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_predicates.py b/roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_predicates.py index c45f255af..f27eb629d 100644 --- a/roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_predicates.py +++ b/roles/openshift_master_facts/lookup_plugins/openshift_master_facts_default_predicates.py @@ -101,7 +101,7 @@ class LookupModule(LookupBase): {'name': 'MatchInterPodAffinity'} ]) - if short_version in ['3.5', '3.6', '3.7']: + if short_version in ['3.5', '3.6']: predicates.extend([ {'name': 'NoVolumeZoneConflict'}, {'name': 'MaxEBSVolumeCount'}, @@ -114,6 +114,21 @@ class LookupModule(LookupBase): {'name': 'CheckNodeDiskPressure'}, ]) + if short_version in ['3.7']: + predicates.extend([ + {'name': 'NoVolumeZoneConflict'}, + {'name': 'MaxEBSVolumeCount'}, + {'name': 'MaxGCEPDVolumeCount'}, + {'name': 'MaxAzureDiskVolumeCount'}, + {'name': 'MatchInterPodAffinity'}, + {'name': 'NoDiskConflict'}, + {'name': 'GeneralPredicates'}, + {'name': 'PodToleratesNodeTaints'}, + {'name': 'CheckNodeMemoryPressure'}, + {'name': 'CheckNodeDiskPressure'}, + {'name': 'NoVolumeNodeConflict'}, + ]) + if regions_enabled: region_predicate = { 'name': 'Region', |