diff options
| author | Russell Teague <rteague@redhat.com> | 2017-01-26 11:36:58 -0500 |
|---|---|---|
| committer | Russell Teague <rteague@redhat.com> | 2017-01-30 16:48:55 -0500 |
| commit | bc2ba98351a4b45a18813cf2dc2cd58f098bc1d3 (patch) | |
| tree | 0787baf98e747bf740c6a167bc6ad8f6612492e4 /playbooks/common/openshift-cluster | |
| parent | db3718ef7107aeb010ebfd9d1493e94c8b302556 (diff) | |
| download | openshift-bc2ba98351a4b45a18813cf2dc2cd58f098bc1d3.tar.gz openshift-bc2ba98351a4b45a18813cf2dc2cd58f098bc1d3.tar.bz2 openshift-bc2ba98351a4b45a18813cf2dc2cd58f098bc1d3.tar.xz openshift-bc2ba98351a4b45a18813cf2dc2cd58f098bc1d3.zip | |
Create v3_5 upgrade playbooks
Diffstat (limited to 'playbooks/common/openshift-cluster')
| -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: |