From 4e78f8b6f8973d0edd1732baa9be7d83ed1dce65 Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <drabotyagov@vexxhost.com>
Date: Thu, 18 Jul 2019 12:46:13 +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: I0f9eeeb5db890ba2119f7e8a5e85b9f6923092d6
---
 defaults/main.yml             |  1 +
 tasks/sahara_pre_install.yml  | 21 ---------------------
 templates/sahara-uwsgi.ini.j2 |  2 +-
 templates/sahara.conf.j2      |  2 +-
 vars/debian.yml               |  1 +
 vars/redhat-7.yml             |  5 +++--
 vars/suse.yml                 |  3 ++-
 7 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 422ccbc..171040e 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -181,6 +181,7 @@ sahara_pip_packages:
   - python-saharaclient
   - python-keystoneclient
   - sahara
+  - systemd-python
   - warlock
   - uwsgi
 
diff --git a/tasks/sahara_pre_install.yml b/tasks/sahara_pre_install.yml
index 3572e1d..515f3a9 100644
--- a/tasks/sahara_pre_install.yml
+++ b/tasks/sahara_pre_install.yml
@@ -42,27 +42,6 @@
     - { path: "/var/cache/sahara" }
     - { path: "{{ sahara_system_user_home }}" }
 
-- name: Test for log directory or link
-  shell: |
-    if [ -h "/var/log/sahara"  ]; then
-      chown -h {{ sahara_system_user_name }}:{{ sahara_system_group_name }} "/var/log/sahara"
-      chown -R {{ sahara_system_user_name }}:{{ sahara_system_group_name }} "$(readlink /var/log/sahara)"
-    else
-      exit 1
-    fi
-  register: log_dir
-  failed_when: false
-  changed_when: log_dir.rc != 0
-
-- name: Create sahara log dir
-  file:
-    path: "/var/log/sahara"
-    state: directory
-    owner: "{{ sahara_system_user_name }}"
-    group: "{{ sahara_system_group_name }}"
-    mode: "0755"
-  when: log_dir.rc != 0
-
 - name: Drop sudoers file
   template:
     src: "sudoers.j2"
diff --git a/templates/sahara-uwsgi.ini.j2 b/templates/sahara-uwsgi.ini.j2
index d241605..1b77e77 100644
--- a/templates/sahara-uwsgi.ini.j2
+++ b/templates/sahara-uwsgi.ini.j2
@@ -16,7 +16,7 @@ lazy-apps = true
 add-header = Connection: close
 buffer-size = {{ sahara_wsgi_buffer_size }}
 thunder-lock = true
-logfile-chmod = 644
+disable-logging = true
 
 # Avoid filling up the logs with health check requests from haproxy.
 route-user-agent = ^osa-haproxy-healthcheck$ donotlog:
diff --git a/templates/sahara.conf.j2 b/templates/sahara.conf.j2
index 6ecbf47..34d6ddd 100644
--- a/templates/sahara.conf.j2
+++ b/templates/sahara.conf.j2
@@ -5,7 +5,7 @@
 use_stderr = False
 
 debug = {{ debug }}
-log_file = /var/log/sahara/sahara.log
+use_journal = True
 fatal_deprecations = {{ sahara_fatal_deprecations }}
 host = {{ sahara_api_bind_address }}
 port = {{ sahara_api_service_port }}
diff --git a/vars/debian.yml b/vars/debian.yml
index 69605ca..5283b55 100644
--- a/vars/debian.yml
+++ b/vars/debian.yml
@@ -18,4 +18,5 @@ cache_timeout: 600
 # Common apt packages
 sahara_distro_packages:
   - git
+  - libsystemd-dev
   - libxml2-dev
diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml
index 621ff1d..bab541c 100644
--- a/vars/redhat-7.yml
+++ b/vars/redhat-7.yml
@@ -13,7 +13,8 @@
 sahara_distro_packages:
   - cronie
   - cronie-anacron
-  - rpcbind
   - git
-  - which
   - libxml2-devel
+  - rpcbind
+  - systemd-devel
+  - which
diff --git a/vars/suse.yml b/vars/suse.yml
index 7a1ec3f..7726c2c 100644
--- a/vars/suse.yml
+++ b/vars/suse.yml
@@ -13,6 +13,7 @@
 sahara_distro_packages:
   - cronie
   - cronie-anacron
-  - rpcbind
   - git-core
+  - rpcbind
+  - systemd-devel
   - which