diff options
author | Devan Goodwin <dgoodwin@redhat.com> | 2016-07-15 15:50:31 -0300 |
---|---|---|
committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-07-25 12:16:16 -0300 |
commit | 31707737a5473bb5cf6545b6675b192a64a913c7 (patch) | |
tree | 0164ca7dfec4e4012b86ad1824887562191e9c7a /playbooks/common/openshift-cluster/enable_dnsmasq.yml | |
parent | d0c75ba21ba84a9df4a6cd12f02ce335ea4f9427 (diff) | |
download | openshift-31707737a5473bb5cf6545b6675b192a64a913c7.tar.gz openshift-31707737a5473bb5cf6545b6675b192a64a913c7.tar.bz2 openshift-31707737a5473bb5cf6545b6675b192a64a913c7.tar.xz openshift-31707737a5473bb5cf6545b6675b192a64a913c7.zip |
Introduce 1.3/3.3 upgrade path.
Refactored the 3.2 upgrade common files out to a path that does not
indicate they are strictly for 3.2.
3.3 upgrade then becomes a relatively small copy of the byo entry point,
all calling the same code as 3.2 upgrade.
Thus far there are no known 3.3 specific upgrade tasks. In future we
will likely want to allow hooks out to version specific pre/upgrade/post
tasks.
Also fixes a bug where the handlers were not restarting
nodes/openvswitch containers doing upgrades, due to a change in Ansible
2+.
Diffstat (limited to 'playbooks/common/openshift-cluster/enable_dnsmasq.yml')
-rw-r--r-- | playbooks/common/openshift-cluster/enable_dnsmasq.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/enable_dnsmasq.yml b/playbooks/common/openshift-cluster/enable_dnsmasq.yml index f2bcc872f..4cfe8617e 100644 --- a/playbooks/common/openshift-cluster/enable_dnsmasq.yml +++ b/playbooks/common/openshift-cluster/enable_dnsmasq.yml @@ -8,11 +8,12 @@ post_tasks: - fail: msg="This playbook requires a master version of at least Origin 1.1 or OSE 3.1" when: not openshift.common.version_gte_3_1_1_or_1_1_1 | bool - + - name: Reconfigure masters to listen on our new dns_port hosts: oo_masters_to_config handlers: - include: ../../../roles/openshift_master/handlers/main.yml + static: yes vars: os_firewall_allow: - service: skydns tcp @@ -43,6 +44,7 @@ hosts: oo_nodes_to_config handlers: - include: ../../../roles/openshift_node/handlers/main.yml + static: yes pre_tasks: - openshift_facts: role: "{{ item.role }}" |