diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-24 02:39:37 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-24 02:39:37 -0700 |
| commit | 2e751e6b408ff9e6f817df32542d84d62c901002 (patch) | |
| tree | 440dbdb8cef74c35e196d5a345bd356e2ada0c95 | |
| parent | 6f15609668be694f6676a3b73b32b685b2fe82b7 (diff) | |
| parent | 605ed502a247b8fc2d6717104d5ddca3c2122d83 (diff) | |
| download | openshift-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
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml | 3 | ||||
| -rw-r--r-- | roles/openshift_master/tasks/journald.yml | 22 | ||||
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 25 |
3 files changed, 28 insertions, 22 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 diff --git a/roles/openshift_master/tasks/journald.yml b/roles/openshift_master/tasks/journald.yml new file mode 100644 index 000000000..f79955e95 --- /dev/null +++ b/roles/openshift_master/tasks/journald.yml @@ -0,0 +1,22 @@ +--- +- name: Checking for journald.conf + stat: path=/etc/systemd/journald.conf + register: journald_conf_file + +- name: Update journald setup + replace: + dest: /etc/systemd/journald.conf + regexp: '^(\#| )?{{ item.var }}=\s*.*?$' + replace: ' {{ item.var }}={{ item.val }}' + backup: yes + with_items: "{{ journald_vars_to_replace | default([]) }}" + when: journald_conf_file.stat.exists + register: journald_update + +# I need to restart journald immediatelly, otherwise it gets into way during +# further steps in ansible +- name: Restart journald + systemd: + name: systemd-journald + state: restarted + when: journald_update | changed diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 824a5886e..d0bc79c0c 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -177,31 +177,12 @@ local_facts: no_proxy_etcd_host_ips: "{{ openshift_no_proxy_etcd_host_ips }}" +- name: Update journald config + include: journald.yml + - name: Install the systemd units include: systemd_units.yml -- name: Checking for journald.conf - stat: path=/etc/systemd/journald.conf - register: journald_conf_file - -- name: Update journald setup - replace: - dest: /etc/systemd/journald.conf - regexp: '^(\#| )?{{ item.var }}=\s*.*?$' - replace: ' {{ item.var }}={{ item.val }}' - backup: yes - with_items: "{{ journald_vars_to_replace | default([]) }}" - when: journald_conf_file.stat.exists - register: journald_update - -# I need to restart journald immediatelly, otherwise it gets into way during -# further steps in ansible -- name: Restart journald - systemd: - name: systemd-journald - state: restarted - when: journald_update | changed - - name: Install Master system container include: system_container.yml when: |