diff options
| author | Russell Teague <rteague@redhat.com> | 2017-01-31 08:05:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-31 08:05:03 -0500 |
| commit | fca215887b2e4224779b58e8fd1b7662ec993f83 (patch) | |
| tree | a8862a16c39d54dc5f123fff532904da371794e1 /playbooks/common | |
| parent | e6bec56b75baa631cdb4902d29cca811db91e9f1 (diff) | |
| parent | bc2ba98351a4b45a18813cf2dc2cd58f098bc1d3 (diff) | |
| download | openshift-fca215887b2e4224779b58e8fd1b7662ec993f83.tar.gz openshift-fca215887b2e4224779b58e8fd1b7662ec993f83.tar.bz2 openshift-fca215887b2e4224779b58e8fd1b7662ec993f83.tar.xz openshift-fca215887b2e4224779b58e8fd1b7662ec993f83.zip | |
Merge pull request #3194 from mtnbikenc/upgrade-3_5-fork
Create v3_5 upgrade playbooks
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/init.yml | 14 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/init.yml b/playbooks/common/openshift-cluster/upgrades/init.yml index b62557550..a3b8c489e 100644 --- a/playbooks/common/openshift-cluster/upgrades/init.yml +++ b/playbooks/common/openshift-cluster/upgrades/init.yml @@ -65,3 +65,17 @@ when: not openshift.common.is_atomic | bool args: warn: no + +- name: Ensure firewall is not switched during upgrade + hosts: oo_all_hosts + tasks: + - name: Check if iptables is running + command: systemctl status iptables + ignore_errors: true + changed_when: false + register: service_iptables_status + + - name: Set fact os_firewall_use_firewalld FALSE for iptables + set_fact: + os_firewall_use_firewalld: false + when: "'Active: active' in service_iptables_status.stdout" diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml index 23b976192..9cad931af 100644 --- a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml +++ b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml @@ -32,7 +32,7 @@ include: ./etcd/main.yml # Create service signer cert when missing. Service signer certificate -# is added to master config in the master config hook for v3_3. +# is added to master config in the master_config_upgrade hook. - name: Determine if service signer cert must be created hosts: oo_first_master tasks: |