summaryrefslogtreecommitdiffstats
path: root/filter_plugins/openshift_node.py
diff options
context:
space:
mode:
authorJason DeTiberus <detiber@gmail.com>2016-05-02 15:59:05 -0400
committerJason DeTiberus <detiber@gmail.com>2016-05-02 15:59:05 -0400
commit2b3943ce16ca421cf96008cfc7e5c86e9983a932 (patch)
treeff6e4cc778af490f9a3ab9563298518b1e681c03 /filter_plugins/openshift_node.py
parent003fb8d42dffa9eb0ae43c70ec71a7b4efab11c7 (diff)
parent4634017844fc330253ccb417086dd710feea0025 (diff)
downloadopenshift-2b3943ce16ca421cf96008cfc7e5c86e9983a932.tar.gz
openshift-2b3943ce16ca421cf96008cfc7e5c86e9983a932.tar.bz2
openshift-2b3943ce16ca421cf96008cfc7e5c86e9983a932.tar.xz
openshift-2b3943ce16ca421cf96008cfc7e5c86e9983a932.zip
Merge pull request #1852 from sdodson/dns-improvements
Fix openshift_use_dnsmasq=False on 1.2/3.2 installs
Diffstat (limited to 'filter_plugins/openshift_node.py')
-rw-r--r--filter_plugins/openshift_node.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/filter_plugins/openshift_node.py b/filter_plugins/openshift_node.py
index 4ef92ba03..22670cf79 100644
--- a/filter_plugins/openshift_node.py
+++ b/filter_plugins/openshift_node.py
@@ -26,7 +26,7 @@ class FilterModule(object):
if openshift_dns_ip != None:
return openshift_dns_ip
- if bool(hostvars['openshift']['common']['version_gte_3_2_or_1_2']):
+ 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: