diff options
| author | Russell Teague <rteague@redhat.com> | 2017-01-26 19:59:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-26 19:59:05 -0500 |
| commit | 3e00b0082c1af7cc77957bbad9ea514874681fb1 (patch) | |
| tree | 14ccfa4385cb562ef486713ea73600458fd15f0a /roles/openshift_facts | |
| parent | 8f2b3f132bc6cd03640c31c0c33cffb01f80138c (diff) | |
| parent | 31f0a163e0d970bce376fe1f75b8dcc390a162c4 (diff) | |
| download | openshift-3e00b0082c1af7cc77957bbad9ea514874681fb1.tar.gz openshift-3e00b0082c1af7cc77957bbad9ea514874681fb1.tar.bz2 openshift-3e00b0082c1af7cc77957bbad9ea514874681fb1.tar.xz openshift-3e00b0082c1af7cc77957bbad9ea514874681fb1.zip | |
Merge pull request #3198 from mtnbikenc/drain-fix
Correct usage of draining nodes
Diffstat (limited to 'roles/openshift_facts')
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 5ca8879b3..3c8e2ab9c 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -867,20 +867,6 @@ def set_deployment_facts_if_unset(facts): return facts -def set_evacuate_or_drain_option(facts): - """OCP before 1.5/3.5 used '--evacuate'. As of 1.5/3.5 OCP uses -'--drain'. Let's make that a fact for easy reference later. - """ - if facts['common']['version_gte_3_5_or_1_5']: - # New-style - facts['common']['evacuate_or_drain'] = '--drain' - else: - # Old-style - facts['common']['evacuate_or_drain'] = '--evacuate' - - return facts - - def set_version_facts_if_unset(facts): """ Set version facts. This currently includes common.version and common.version_gte_3_1_or_1_1. @@ -1969,7 +1955,6 @@ class OpenShiftFacts(object): facts = build_controller_args(facts) facts = build_api_server_args(facts) facts = set_version_facts_if_unset(facts) - facts = set_evacuate_or_drain_option(facts) facts = set_dnsmasq_facts_if_unset(facts) facts = set_manageiq_facts_if_unset(facts) facts = set_aggregate_facts(facts) |