summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-cluster/openshift_hosted.yml2
-rw-r--r--playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml15
-rw-r--r--playbooks/common/openshift-master/restart_hosts.yml3
3 files changed, 18 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/openshift_hosted.yml b/playbooks/common/openshift-cluster/openshift_hosted.yml
index 021d19dad..34f1a979b 100644
--- a/playbooks/common/openshift-cluster/openshift_hosted.yml
+++ b/playbooks/common/openshift-cluster/openshift_hosted.yml
@@ -55,4 +55,4 @@
- include_role:
name: openshift_hosted_logging
tasks_from: update_master_config
- when: openshift_hosted_logging_deploy | default(false) | boola
+ when: openshift_hosted_logging_deploy | default(false) | bool
diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml
index 5fa74898f..a6a49e5ff 100644
--- a/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml
+++ b/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml
@@ -81,6 +81,21 @@
failed_when: false
when: openshift.common.is_containerized | bool
+ - name: Upgrade openvswitch
+ package:
+ name: openvswitch
+ state: latest
+ register: ovs_pkg
+ when: inventory_hostname in groups.oo_nodes_to_upgrade and not openshift.common.is_containerized | bool
+
+ - name: Restart openvswitch
+ systemd:
+ name: openvswitch
+ state: restarted
+ when:
+ - inventory_hostname in groups.oo_nodes_to_upgrade and not openshift.common.is_containerized | bool
+ - ovs_pkg | changed
+
# Mandatory Docker restart, ensure all containerized services are running:
- include: docker/restart.yml
diff --git a/playbooks/common/openshift-master/restart_hosts.yml b/playbooks/common/openshift-master/restart_hosts.yml
index 832301e3d..475144dbf 100644
--- a/playbooks/common/openshift-master/restart_hosts.yml
+++ b/playbooks/common/openshift-master/restart_hosts.yml
@@ -10,9 +10,10 @@
- name: Wait for master to restart
local_action:
module: wait_for
- host="{{ inventory_hostname }}"
+ host="{{ ansible_host }}"
state=started
delay=10
+ timeout=600
become: no
# Now that ssh is back up we can wait for API on the remote system,