diff options
author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-09-07 10:57:28 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-07 10:57:28 -0400 |
commit | 6da235f41a31776b1bc253a34dc14a30307e331e (patch) | |
tree | bda2cc62691a59fb6ac6ed4978fa7f15ec046121 /filter_plugins | |
parent | aad4ccce7ce6641d3c720507568f6da779a66995 (diff) | |
parent | 8bf97723ceaca02fe12b86466f8383aa211ead5e (diff) | |
download | openshift-6da235f41a31776b1bc253a34dc14a30307e331e.tar.gz openshift-6da235f41a31776b1bc253a34dc14a30307e331e.tar.bz2 openshift-6da235f41a31776b1bc253a34dc14a30307e331e.tar.xz openshift-6da235f41a31776b1bc253a34dc14a30307e331e.zip |
Merge pull request #5208 from mgugino-upstream-stage/remove-openshift_common
Merged by openshift-bot
Diffstat (limited to 'filter_plugins')
-rw-r--r-- | filter_plugins/openshift_node.py | 13 |
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 ''' |