File 0001-Configure-monasca-log-api-wsgi-service-bsc... of Package ardana-logging

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Configure-monasca-log-api-wsgi-service-bsc-1079673.patch of Package ardana-logging (Revision a3e120eb8fd20d9f4f5fdd55791361ab)

Currently displaying revision a3e120eb8fd20d9f4f5fdd55791361ab , Show latest

From b00a93721c7dd550692f813abedadf98867e469d Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dirk@dmllr.de>
Date: Tue, 20 Feb 2018 15:58:06 +0100
Subject: [PATCH] Configure monasca-log-api wsgi service (bsc#1079673)

For non-legacy builds, switch to use the monasca venv
and link the wsgi app to www_root so that it is available
for apache2.

Change-Id: I19cdd7577fa466049884fa7c9f221f5f73bee241
---
 roles/kronos-api/tasks/configure.yml               | 12 +++++++-
 roles/kronos-api/tasks/install.yml                 |  7 +++++
 .../templates/monasca-log-apache2.conf.j2          | 32 ++++++++++++++++++++++
 roles/logging-common/defaults/main.yml             |  2 +-
 4 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 roles/kronos-api/templates/monasca-log-apache2.conf.j2

diff --git a/roles/kronos-api/tasks/configure.yml b/roles/kronos-api/tasks/configure.yml
index 0e5a1fc..9fe9069 100644
--- a/roles/kronos-api/tasks/configure.yml
+++ b/roles/kronos-api/tasks/configure.yml
@@ -40,12 +40,22 @@
   register: ardana_notify_kronos_api_restart
   when: ( 'MON_API' in verb_hosts )
 
-- name: kronos-api | configure | Configure Kronos/Apache vhost
+- name: kronos-api | configure | Configure Monasca-Log Apache vhost (legacy)
   become: yes
   template:
     src: kronos-apache2.conf.j2
     dest: "{{ apache2_vhost_dir }}/kronos-apache2.vhost"
     mode: 0755
+  when: deployer_media_legacy_layout|bool
+  register: ardana_notify_kronos_apache_reload
+
+- name: kronos-api | configure | Configure Monasca-Log Apache vhost
+  become: yes
+  template:
+    src: monasca-log-apache2.conf.j2
+    dest: "{{ apache2_vhost_dir }}/kronos-apache2.vhost"
+    mode: 0755
+  when: not deployer_media_legacy_layout|bool
   register: ardana_notify_kronos_apache_reload
 
 - name: kronos-api | configure | Configure Kronos/Apache log file ownership
diff --git a/roles/kronos-api/tasks/install.yml b/roles/kronos-api/tasks/install.yml
index ea0b0fc..dfe09dd 100644
--- a/roles/kronos-api/tasks/install.yml
+++ b/roles/kronos-api/tasks/install.yml
@@ -71,3 +71,10 @@
     group: "{{ kronos_group }}"
     mode: 0755
     recurse: yes
+
+- name: kronos-api | install | Link log-api WSGI file
+  become: yes
+  file:
+    src: "{{ 'monasca' | venv_dir }}/bin/monasca-log-api-wsgi"
+    dest: "{{ kronos_wsgi_dir }}/monasca-log-api-wsgi"
+    state: link
diff --git a/roles/kronos-api/templates/monasca-log-apache2.conf.j2 b/roles/kronos-api/templates/monasca-log-apache2.conf.j2
new file mode 100644
index 0000000..974c0d7
--- /dev/null
+++ b/roles/kronos-api/templates/monasca-log-apache2.conf.j2
@@ -0,0 +1,32 @@
+{#
+#
+# (c) Copyright 2015-2016 Hewlett Packard Enterprise Development LP
+# (c) Copyright 2017-2018 SUSE LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+#}
+Listen {{ kronos_api_host }}:{{ kronos_api_port }}
+
+<VirtualHost *:{{ kronos_api_port }}>
+    WSGIDaemonProcess log-api processes=4 threads=4 socket-timeout=300  user={{ kronos_user }} group={{ kronos_group }} python-path=/opt/stack/service/monasca/venv/bin/../lib/python2.7/site-packages/ display-name=monasca-log-api
+    WSGIProcessGroup log-api
+    WSGIApplicationGroup %{GLOBAL}
+    WSGIScriptAlias / {{ kronos_wsgi_dir }}/monasca-log-api-wsgi
+
+    ErrorLog /var/log/kronos/wsgi.log
+    LogLevel info
+    CustomLog /var/log/kronos/wsgi-access.log combined
+
+    SetEnv no-gzip 1
+</VirtualHost>
diff --git a/roles/logging-common/defaults/main.yml b/roles/logging-common/defaults/main.yml
index feab590..8305502 100644
--- a/roles/logging-common/defaults/main.yml
+++ b/roles/logging-common/defaults/main.yml
@@ -282,7 +282,7 @@ kronos_api_admin_role: "service"
 kronos_user: kronos
 kronos_group: adm
 kronos_log_dir: /var/log/kronos
-kronos_wsgi_dir: /var/www/kronos
+kronos_wsgi_dir: "{{ www_root }}/kronos"
 
 kronos_api_log_file: kronos-api.log
 kronos_api_host: "{{ host.bind.LOG_API.internal.ip_address }}"
-- 
2.16.1

Places

File 0001-Configure-monasca-log-api-wsgi-service-bsc-1079673.patch of Package ardana-logging (Revision a3e120eb8fd20d9f4f5fdd55791361ab)

Places