From 2fe6aaa3221c506c5b290b333683cea67dea2e0b Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <drabotyagov@vexxhost.com>
Date: Wed, 17 Jul 2019 16:12:08 +0300
Subject: [PATCH] Use systemd-journald instead of log files

This patch aims to migrate service from usage of regular syslog files
to journald. We also disable uwsgi logging, since it dublicates
requests that are logged by service itself.

Change-Id: I8be07495dd84f085de6d4409f2efd67a8359d82e
---
 defaults/main.yml             |  2 +-
 tasks/magnum_pre_install.yml  | 21 ---------------------
 templates/magnum-uwsgi.ini.j2 |  2 +-
 templates/magnum.conf.j2      |  1 +
 vars/debian.yml               |  1 +
 vars/redhat.yml               |  1 +
 vars/suse.yml                 |  1 +
 7 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index e3a2025..bfec7b2 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -35,7 +35,6 @@ magnum_system_user_name: magnum
 magnum_system_user_comment: Magnum System User
 magnum_system_user_shell: /bin/false
 magnum_system_user_home: "/var/lib/{{ magnum_system_user_name }}"
-magnum_log_directory: /var/log/magnum
 magnum_etc_directory: /etc/magnum
 
 magnum_service_name: magnum
@@ -146,6 +145,7 @@ magnum_pip_packages:
   - osprofiler
   - PyMySQL
   - python-memcached
+  - systemd-python
   - uwsgi
 
 # Specific pip packages provided by the user
diff --git a/tasks/magnum_pre_install.yml b/tasks/magnum_pre_install.yml
index 146c68c..212c93b 100644
--- a/tasks/magnum_pre_install.yml
+++ b/tasks/magnum_pre_install.yml
@@ -40,24 +40,3 @@
     - { path: "/openstack/venvs", mode: "0755", owner: "root", group: "root" }
     - path: "/etc/magnum"
     - path: "{{ magnum_system_user_home }}"
-
-- name: Test for Magnum log directory or link
-  shell: |
-    if [ -h "{{ magnum_log_directory }}" ]; then
-      chown -h {{ magnum_system_user_name }}:{{ magnum_system_group_name }} {{ magnum_log_directory }}
-      chown -R {{ magnum_system_user_name }}:{{ magnum_system_group_name }} "$(readlink {{ magnum_log_directory }})"
-    else
-      exit 1
-    fi
-  register: log_dir
-  failed_when: false
-  changed_when: log_dir.rc != 0
-
-- name: Create Magnum log directory
-  file:
-    path: "{{ magnum_log_directory }}"
-    state: "directory"
-    owner: "{{ magnum_system_user_name }}"
-    group: "{{ magnum_system_group_name }}"
-    mode: "0750"
-  when: log_dir.rc != 0
diff --git a/templates/magnum-uwsgi.ini.j2 b/templates/magnum-uwsgi.ini.j2
index c2a3f21..8c95d86 100644
--- a/templates/magnum-uwsgi.ini.j2
+++ b/templates/magnum-uwsgi.ini.j2
@@ -16,4 +16,4 @@ lazy-apps = true
 add-header = Connection: close
 buffer-size = {{ magnum_wsgi_buffer_size }}
 thunder-lock = true
-logfile-chmod = 644
+disable-logging = true
diff --git a/templates/magnum.conf.j2 b/templates/magnum.conf.j2
index a64ee0a..68e157d 100644
--- a/templates/magnum.conf.j2
+++ b/templates/magnum.conf.j2
@@ -2,6 +2,7 @@
 # Disable stderr logging
 use_stderr = False
 debug = {{ debug }}
+use_journal = True
 host = {{ ansible_host }}
 transport_url = {{ magnum_oslomsg_rpc_transport }}://{% for host in magnum_oslomsg_rpc_servers.split(',') %}{{ magnum_oslomsg_rpc_userid }}:{{ magnum_oslomsg_rpc_password }}@{{ host }}:{{ magnum_oslomsg_rpc_port }}{% if not loop.last %},{% else %}/{{ magnum_oslomsg_rpc_vhost }}{% if magnum_oslomsg_rpc_use_ssl | bool %}?ssl=1{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}
 
diff --git a/vars/debian.yml b/vars/debian.yml
index 61f2c66..9e6f0f7 100644
--- a/vars/debian.yml
+++ b/vars/debian.yml
@@ -23,6 +23,7 @@ magnum_distro_packages:
   - libxml2-dev
   - libxslt-dev
   - libpq-dev
+  - libsystemd-dev
   - git
   - libffi-dev
   - gettext
diff --git a/vars/redhat.yml b/vars/redhat.yml
index 7636d5a..caf7b98 100644
--- a/vars/redhat.yml
+++ b/vars/redhat.yml
@@ -24,3 +24,4 @@ magnum_distro_packages:
   - libffi-devel
   - gettext
   - gcc
+  - systemd-devel
diff --git a/vars/suse.yml b/vars/suse.yml
index bb7f30f..f9d4548 100644
--- a/vars/suse.yml
+++ b/vars/suse.yml
@@ -25,3 +25,4 @@ magnum_distro_packages:
   - libffi-devel
   - gettext
   - gcc
+  - systemd-devel