Merge tag 'openshift-ansible-3.0.88-1'

Tagging package [openshift-ansible] version [3.0.88-1] in directory [./].

.tito/packages/openshift-ansible

@@ -1 +1 @@
-3.0.87-1 ./
+3.0.88-1 ./

openshift-ansible.spec

@@ -5,7 +5,7 @@
 }
 
 Name:           openshift-ansible
-Version:        3.0.87
+Version:        3.0.88
 Release:        1%{?dist}
 Summary:        Openshift and Atomic Enterprise Ansible
 License:        ASL 2.0
@@ -183,6 +183,10 @@ Atomic OpenShift Utilities includes
 
 
 %changelog
+* Fri May 06 2016 Brenton Leanhardt <bleanhar@redhat.com> 3.0.88-1
+- Open port 53 whenever we're unsure of version (sdodson@redhat.com)
+- Fix unsafe boolean handling on use_dnsmasq (sdodson@redhat.com)
+
 * Wed Apr 27 2016 Troy Dawson <tdawson@redhat.com> 3.0.87-1
 - a-o-i-: Allow empty proxy (smunilla@redhat.com)
 - a-o-i: Populate groups for openshift_facts (smunilla@redhat.com)

roles/openshift_facts/library/openshift_facts.py

@@ -499,12 +499,12 @@ def set_dnsmasq_facts_if_unset(facts):
     """
 
     if 'common' in facts:
-        if 'use_dnsmasq' not in facts['common'] and facts['common']['version_gte_3_2_or_1_2']:
+        if 'use_dnsmasq' not in facts['common'] and safe_get_bool(facts['common']['version_gte_3_2_or_1_2']):
             facts['common']['use_dnsmasq'] = True
         else:
             facts['common']['use_dnsmasq'] = False
         if 'master' in facts and 'dns_port' not in facts['master']:
-            if facts['common']['use_dnsmasq']:
+            if safe_get_bool(facts['common']['use_dnsmasq']):
                 facts['master']['dns_port'] = 8053
             else:
                 facts['master']['dns_port'] = 53

roles/openshift_master/defaults/main.yml

@@ -13,6 +13,14 @@ os_firewall_allow:
   port: "{{ openshift.master.dns_port }}/tcp"
 - service: skydns udp
   port: "{{ openshift.master.dns_port }}/udp"
+# On HA masters version_gte facts are not properly set so open port 53
+# whenever we're not certain of the need
+- service: legacy skydns tcp
+  port: "53/tcp"
+  when: "{{ 'version' not in openshift.common or openshift.common.version == None }}"
+- service: legacy skydns udp
+  port: "53/udp"
+  when: "{{ 'version' not in openshift.common or openshift.common.version == None }}"
 - service: Fluentd td-agent tcp
   port: 24224/tcp
 - service: Fluentd td-agent udp