Merge pull request #7280 from nak3/move-journad-to-node

Automatic merge from submit-queue.

Move journald setup to node tasks from master

Currently master hosts are modified its journald settings after the
installation, but node hosts will not.

It makes an inconsistent journald settings within the same
cluster. Also most users set `schedulable=false` for nodes on master hosts,
so actually they want to configure the settings on node hosts.

This PR moves journald settings to node's task from master's.

roles/openshift_master/defaults/main.yml

@@ -91,26 +91,6 @@ openshift_master_oauth_templates: "{{ openshift_master_oauth_template | ternary(
 # Here we combine openshift_master_oath_template into 'login' key of openshift_master_oath_templates, if not present.
 l_openshift_master_oauth_templates: "{{ openshift_master_oauth_templates | default(openshift_master_oauth_templates_default) }}"
 
-# These defaults assume forcing journald persistence, fsync to disk once
-# a second, rate-limiting to 10,000 logs a second, no forwarding to
-# syslog or wall, using 8GB of disk space maximum, using 10MB journal
-# files, keeping only a days worth of logs per journal file, and
-# retaining journal files no longer than a month.
-journald_vars_to_replace:
-- { var: Storage, val: persistent }
-- { var: Compress, val: yes }
-- { var: SyncIntervalSec, val: 1s }
-- { var: RateLimitInterval, val: 1s }
-- { var: RateLimitBurst, val: 10000 }
-- { var: SystemMaxUse, val: 8G }
-- { var: SystemKeepFree, val: 20% }
-- { var: SystemMaxFileSize, val: 10M }
-- { var: MaxRetentionSec, val: 1month }
-- { var: MaxFileSec, val: 1day }
-- { var: ForwardToSyslog, val: no }
-- { var: ForwardToWall, val: no }
-
-
 # NOTE
 # r_openshift_master_*_default may be defined external to this role.
 # openshift_use_*, if defined, may affect other roles or play behavior.

roles/openshift_master/tasks/main.yml

@@ -146,9 +146,6 @@
     local_facts:
       no_proxy_etcd_host_ips: "{{ openshift_no_proxy_etcd_host_ips }}"
 
-- name: Update journald config
-  include_tasks: journald.yml
-
 - name: Install the systemd units
   include_tasks: systemd_units.yml
 

roles/openshift_master/tasks/upgrade.yml

@@ -8,8 +8,6 @@
 - include_tasks: "upgrade/{{ master_config_hook }}"
   when: master_config_hook is defined
 
-- include_tasks: journald.yml
-
 - include_tasks: systemd_units.yml
 
 - name: Check for ca-bundle.crt

roles/openshift_node/defaults/main.yml

@@ -201,6 +201,25 @@ openshift_docker_alternative_creds: "{{ (openshift_docker_use_system_container |
 
 openshift_docker_service_name: "{{ 'container-engine' if (openshift_docker_use_system_container | default(False) | bool) else 'docker' }}"
 
+# These defaults assume forcing journald persistence, fsync to disk once
+# a second, rate-limiting to 10,000 logs a second, no forwarding to
+# syslog or wall, using 8GB of disk space maximum, using 10MB journal
+# files, keeping only a days worth of logs per journal file, and
+# retaining journal files no longer than a month.
+journald_vars_to_replace:
+- { var: Storage, val: persistent }
+- { var: Compress, val: yes }
+- { var: SyncIntervalSec, val: 1s }
+- { var: RateLimitInterval, val: 1s }
+- { var: RateLimitBurst, val: 10000 }
+- { var: SystemMaxUse, val: 8G }
+- { var: SystemKeepFree, val: 20% }
+- { var: SystemMaxFileSize, val: 10M }
+- { var: MaxRetentionSec, val: 1month }
+- { var: MaxFileSec, val: 1day }
+- { var: ForwardToSyslog, val: no }
+- { var: ForwardToWall, val: no }
+
 # NOTE
 # r_openshift_node_*_default may be defined external to this role.
 # openshift_use_*, if defined, may affect other roles or play behavior.

roles/openshift_node/tasks/main.yml

@@ -12,6 +12,9 @@
 - name: setup firewall
   import_tasks: firewall.yml
 
+- name: Update journald config
+  include_tasks: journald.yml
+
 #### Disable SWAP #####
 # https://docs.openshift.com/container-platform/3.4/admin_guide/overcommit.html#disabling-swap-memory
 # swapoff is a custom module in lib_utils that comments out swap entries in

roles/openshift_node/tasks/upgrade.yml

@@ -51,4 +51,6 @@
 - include_tasks: dnsmasq_install.yml
 - include_tasks: dnsmasq.yml
 
+- include_tasks: journald.yml
+
 - meta: flush_handlers