From 31f0a163e0d970bce376fe1f75b8dcc390a162c4 Mon Sep 17 00:00:00 2001 From: Russell Teague Date: Thu, 26 Jan 2017 15:25:34 -0500 Subject: Correct usage of draining nodes --- roles/openshift_facts/library/openshift_facts.py | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'roles/openshift_facts') 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) -- cgit v1.2.3