summaryrefslogtreecommitdiffstats
path: root/filter_plugins
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-08-25 00:10:54 -0400
committerMichael Gugino <mgugino@redhat.com>2017-09-06 13:59:38 -0400
commit8bf97723ceaca02fe12b86466f8383aa211ead5e (patch)
treee73adc1d43d5a07b0e6c941d8e555919e3266fed /filter_plugins
parentb5cf769b97691d75e07d1e0e3b29ecbc31ba32ea (diff)
downloadopenshift-8bf97723ceaca02fe12b86466f8383aa211ead5e.tar.gz
openshift-8bf97723ceaca02fe12b86466f8383aa211ead5e.tar.bz2
openshift-8bf97723ceaca02fe12b86466f8383aa211ead5e.tar.xz
openshift-8bf97723ceaca02fe12b86466f8383aa211ead5e.zip
Remove openshift-common
Most of this role's purpose was to set facts. The vast majority of these facts were simply redefining user-supplied variables. This commit also removes various artifacts leftover from previous versions, as well as variables that seem to be entirely unused.
Diffstat (limited to 'filter_plugins')
-rw-r--r--filter_plugins/openshift_node.py13
1 files changed, 1 insertions, 12 deletions
diff --git a/filter_plugins/openshift_node.py b/filter_plugins/openshift_node.py
index cad95ea6d..50c360e97 100644
--- a/filter_plugins/openshift_node.py
+++ b/filter_plugins/openshift_node.py
@@ -25,18 +25,7 @@ class FilterModule(object):
# We always use what they've specified if they've specified a value
if openshift_dns_ip is not None:
return openshift_dns_ip
-
- if bool(hostvars['openshift']['common']['use_dnsmasq']):
- return hostvars['ansible_default_ipv4']['address']
- elif bool(hostvars['openshift']['common']['version_gte_3_1_or_1_1']):
- if 'openshift_master_cluster_vip' in hostvars:
- return hostvars['openshift_master_cluster_vip']
- else:
- if 'openshift_master_cluster_vip' in hostvars:
- return hostvars['openshift_master_cluster_vip']
- elif 'openshift_node_first_master_ip' in hostvars:
- return hostvars['openshift_node_first_master_ip']
- return None
+ return hostvars['ansible_default_ipv4']['address']
def filters(self):
''' returns a mapping of filters to methods '''