diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-05-06 16:55:02 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-05-06 16:55:02 -0400 |
| commit | a9bf2540412983ff65ea376eb2ed0675536dd102 (patch) | |
| tree | ec49ad2928959b39fee036d677b833528418beae | |
| parent | 4f3f588ee59a1e888340d24ba912346c240cacc6 (diff) | |
| parent | 31c3daf9d81afcb85bd22c8ad47eea9381c5cc34 (diff) | |
| download | openshift-a9bf2540412983ff65ea376eb2ed0675536dd102.tar.gz openshift-a9bf2540412983ff65ea376eb2ed0675536dd102.tar.bz2 openshift-a9bf2540412983ff65ea376eb2ed0675536dd102.tar.xz openshift-a9bf2540412983ff65ea376eb2ed0675536dd102.zip | |
Merge tag 'openshift-ansible-3.0.88-1'
Tagging package [openshift-ansible] version [3.0.88-1] in directory [./].
| -rw-r--r-- | .tito/packages/openshift-ansible | 2 | ||||
| -rw-r--r-- | openshift-ansible.spec | 6 | ||||
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 4 | ||||
| -rw-r--r-- | roles/openshift_master/defaults/main.yml | 8 |
4 files changed, 16 insertions, 4 deletions
diff --git a/.tito/packages/openshift-ansible b/.tito/packages/openshift-ansible index 67ff60a4a..3f8085fa9 100644 --- a/.tito/packages/openshift-ansible +++ b/.tito/packages/openshift-ansible @@ -1 +1 @@ -3.0.87-1 ./ +3.0.88-1 ./ diff --git a/openshift-ansible.spec b/openshift-ansible.spec index 57cc726b5..473e74bee 100644 --- a/openshift-ansible.spec +++ b/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) diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 643984982..bfd09676f 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/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 diff --git a/roles/openshift_master/defaults/main.yml b/roles/openshift_master/defaults/main.yml index 09bde6002..16df984f9 100644 --- a/roles/openshift_master/defaults/main.yml +++ b/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 |