Merge "Use systemd-journald instead of log files"

defaults/main.yml

@@ -247,6 +247,7 @@ glance_pip_packages:
   - python-keystoneclient
   - python-memcached
   - python-swiftclient
+  - systemd-python
   - uwsgi
   - warlock
 

tasks/glance_install.yml

@@ -113,8 +113,6 @@
     - path: "{{ glance_system_user_home }}/scrubber"
     - path: "{{ glance_system_user_home }}/images"
       mode: "0755"
-    - path: "/var/log/glance"
-      mode: "0755"
 
 - name: Install distro packages
   package:

templates/glance-api.conf.j2

@@ -4,7 +4,7 @@
 # Disable stderr logging
 use_stderr = False
 debug = {{ debug }}
-log_file = /var/log/glance/glance-api.log
+use_journal = True
 fatal_deprecations = {{ glance_fatal_deprecations }}
 bind_host = {{ glance_api_bind_address }}
 bind_port = {{ glance_api_service_port }}

templates/glance-cache.conf.j2

@@ -4,6 +4,7 @@
 # Disable stderr logging
 use_stderr = False
 debug = {{ debug }}
+use_journal = True
 admin_password = {{ glance_service_password }}
 admin_user = {{ glance_service_user_name }}
 admin_tenant_name = {{ glance_service_project_name }}

templates/glance-manage.conf.j2

@@ -2,7 +2,7 @@
 # Disable stderr logging
 use_stderr = False
 debug = {{ debug }}
-log_file = /var/log/glance/glance-manage.log
+use_journal = True
 fatal_deprecations = {{ glance_fatal_deprecations }}
 
 [database]

templates/glance-registry.conf.j2

@@ -5,7 +5,7 @@
 use_stderr = False
 debug = {{ debug }}
 fatal_deprecations = {{ glance_fatal_deprecations }}
-log_file = /var/log/glance/glance-registry.log
+use_journal = True
 bind_host = {{ glance_registry_bind_address }}
 bind_port = {{ glance_registry_service_port }}
 http_keepalive = {{ glance_http_keepalive }}

templates/glance-scrubber.conf.j2

@@ -4,12 +4,7 @@
 # Disable stderr logging
 use_stderr = False
 debug = {{ debug }}
-# Log to this file. Make sure you do not set the same log file for both the API
-# and registry servers!
-#
-# If `log_file` is omitted then log messages are
-# sent to stdout as a fallback.
-log_file = /var/log/glance/scrubber.log
+use_journal = True
 
 # Should we run our own loop or rely on cron/scheduler to run us
 daemon = False

templates/glance-uwsgi.ini.j2

@@ -21,7 +21,7 @@ lazy-apps = true
 add-header = Connection: close
 buffer-size = {{ glance_wsgi_buffer_size }}
 thunder-lock = true
-logfile-chmod = 644
+disable-logging = true
 http-auto-chunked = true
 http-raw-body = true
 socket-timeout = 10

vars/debian.yml

@@ -26,9 +26,11 @@ glance_distro_packages:
 
 glance_devel_distro_packages:
   - libxml2-dev
+  - libsystemd-dev
 
 glance_service_distro_packages:
   - python3-glance
+  - python3-systemd
   - uwsgi
   - uwsgi-plugin-python3
 

vars/redhat.yml

@@ -22,9 +22,11 @@ glance_distro_packages:
 
 glance_devel_distro_packages:
   - libxml2-devel
+  - systemd-devel
 
 glance_service_distro_packages:
   - openstack-glance
+  - systemd-python
   - uwsgi
   - uwsgi-plugin-python
 

vars/suse.yml

@@ -23,10 +23,12 @@ glance_distro_packages:
 
 glance_devel_distro_packages:
   - libxml2-devel
+  - systemd-devel
 
 glance_service_distro_packages:
   - openstack-glance
   - openstack-glance-api
+  - python-systemd
   - uwsgi
   - uwsgi-python