Merge "Use systemd-journald instead of log files"

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

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

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

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 %}
 

vars/debian.yml

@@ -23,6 +23,7 @@ magnum_distro_packages:
   - libxml2-dev
   - libxslt-dev
   - libpq-dev
+  - libsystemd-dev
   - git
   - libffi-dev
   - gettext

vars/redhat.yml

@@ -24,3 +24,4 @@ magnum_distro_packages:
   - libffi-devel
   - gettext
   - gcc
+  - systemd-devel

vars/suse.yml

@@ -25,3 +25,4 @@ magnum_distro_packages:
   - libffi-devel
   - gettext
   - gcc
+  - systemd-devel