Skip to content
Snippets Groups Projects
Commit 72f84d17 authored by Maarten de Waard's avatar Maarten de Waard :angel:
Browse files

Merge branch '575-remove-rsyslogd-syslog-ng-and-logrotate' into 'master'

Resolve "Remove rsyslogd and syslog-ng"

Closes #575

See merge request openappstack/openappstack!279
parents 6aee5425 0cc09c68
No related branches found
No related tags found
No related merge requests found
......@@ -2,8 +2,6 @@
configuration_directory: "/etc/OpenAppStack"
# Directory to store generated configuration and cluster state.
data_directory: "/var/lib/OpenAppStack"
# Directory to store logs.
log_directory: "/var/log/OpenAppStack"
# Use python3 on cluster nodes for ansible
ansible_python_interpreter: "/usr/bin/env python3"
......
/var/log/OpenAppStack/ {
weekly
rotate 4
create
}
---
- name: Logrotate config for OAS logs
copy:
src: etc/logrotate.d/OpenAppStack
dest: /etc/logrotate.d/
mode: '0644'
---
- import_tasks: logging.yml
- import_tasks: dns.yml
---
- name: restart-journald
service:
name: systemd-journald
state: restarted
---
- name: Ensure journald directories
file:
path: '{{ item }}'
state: directory
with_items:
- /var/log/journal
- /etc/systemd/journald.conf.d
- name: Configure journald size limits
template:
dest: /etc/systemd/journald.conf.d/size-limits.conf
src: journald.conf
notify: restart-journald
---
- name: Configure journald
import_tasks: journald.yml
- name: Update apt packages cache and install needed packages
# apt-transport-https is needed for docker apt repo
# curl and git is needed for helm plugin install
......@@ -20,6 +23,19 @@
cache_valid_time: 86400
update_cache: yes
- name: Remove unwanted packages
tags:
- package
package:
state: absent
name: "{{ item }}"
with_items:
# In order to save disk space we remove traditional syslog packages
# and only rely on systemd journald
# see https://open.greenhost.net/openappstack/openappstack/-/issues/575
- rsyslog
- syslog-ng
- name: Install python deps
tags:
- package
......@@ -57,13 +73,6 @@
src: /snap/bin/kubectl
dest: /usr/local/bin/kubectl
- name: Remove old helm snap installation
tags:
- helm
command: snap remove helm
args:
removes: /snap/bin/helm
- name: Get current helm version
tags:
- helm
......
# https://www.freedesktop.org/software/systemd/man/journald.conf.html
[Journal]
Storage=persistent
SystemMaxUse=400M
SystemMaxFileSize=30M
RuntimeMaxUse=250M
RuntimeMaxFileSize=30M
......@@ -11,7 +11,5 @@
loop:
- src: "{{ data_directory }}/rke/kube_config_cluster.yml"
dest: "{{ cluster_dir }}/secrets/kube_config_cluster.yml"
- src: "{{ log_directory }}/rke.log"
dest: "{{ cluster_dir }}/cluster_data/rke.log"
- src: "{{ data_directory }}/rke/cluster.yml"
dest: "{{ cluster_dir }}/cluster_data/rke_cluster.yml"
......@@ -10,7 +10,6 @@
- "{{ data_directory }}"
- "{{ data_directory }}/ssh"
- "{{ data_directory }}/rke"
- "{{ log_directory }}"
- "/usr/local/share/bash-completion/completions"
- name: Create directory for values
......
......@@ -11,7 +11,7 @@
- name: Build Cluster
tags:
- rke
shell: /usr/local/bin/rke up --config={{ data_directory }}/rke/cluster.yml >> {{ log_directory }}/rke.log
shell: /usr/local/bin/rke up --config={{ data_directory }}/rke/cluster.yml | systemd-cat -t rke
- name: Ensure /root/.kube directory
tags:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment