summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-10-24 02:39:37 -0700
committerGitHub <noreply@github.com>2017-10-24 02:39:37 -0700
commit2e751e6b408ff9e6f817df32542d84d62c901002 (patch)
tree440dbdb8cef74c35e196d5a345bd356e2ada0c95 /playbooks
parent6f15609668be694f6676a3b73b32b685b2fe82b7 (diff)
parent605ed502a247b8fc2d6717104d5ddca3c2122d83 (diff)
downloadopenshift-2e751e6b408ff9e6f817df32542d84d62c901002.tar.gz
openshift-2e751e6b408ff9e6f817df32542d84d62c901002.tar.bz2
openshift-2e751e6b408ff9e6f817df32542d84d62c901002.tar.xz
openshift-2e751e6b408ff9e6f817df32542d84d62c901002.zip
Merge pull request #5796 from mgugino-upstream-stage/journald-masters-upgrades
Automatic merge from submit-queue. Ensure upgrades apply latest journald settings Currently, existing clusters might not have journald configurations applied. This may result in a rate- limiting of important log messages on openshift-masters. This commit ensures that journald settings are applied during the upgrade process openshif-masters. Fixes: https://github.com/openshift/openshift-ansible/issues/5642
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml3
1 files changed, 3 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
index ea4e25f8f..a5e2f7940 100644
--- a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
+++ b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
@@ -90,6 +90,9 @@
- include_vars: ../../../../roles/openshift_master/vars/main.yml
+ - name: Update journald config
+ include: ../../../../roles/openshift_master/tasks/journald.yml
+
- name: Remove any legacy systemd units and update systemd units
include: ../../../../roles/openshift_master/tasks/systemd_units.yml