diff --git a/snap-overlay/bin/set-default-config.py b/snap-overlay/bin/set-default-config.py index 8623560..e3c195a 100755 --- a/snap-overlay/bin/set-default-config.py +++ b/snap-overlay/bin/set-default-config.py @@ -55,6 +55,7 @@ def _get_default_config(): 'config.logging.custom-config': f'{snap_common}/etc/filebeat' '/filebeat-microstack.yaml', 'config.logging.datatag': '', + 'config.logging.debug': False, 'config.logging.host': 'localhost:5044', 'config.services.extra.enabled': False, 'config.services.extra.filebeat': False, diff --git a/snap-overlay/snap-openstack.yaml b/snap-overlay/snap-openstack.yaml index aed5901..1d3a4f5 100644 --- a/snap-overlay/snap-openstack.yaml +++ b/snap-overlay/snap-openstack.yaml @@ -110,6 +110,7 @@ setup: dashboard_port: 'config.network.ports.dashboard' mysql_port: 'config.network.ports.mysql' rabbit_port: 'config.network.ports.rabbit' + logging_debug: 'config.logging.debug' logging_tag: 'config.logging.logging.tag' logging_host: 'config.logging.host' monitoring_tag: 'config.monitoring.tag' diff --git a/snap-overlay/templates/cinder-snap.conf.j2 b/snap-overlay/templates/cinder-snap.conf.j2 index b0f09d5..5192770 100644 --- a/snap-overlay/templates/cinder-snap.conf.j2 +++ b/snap-overlay/templates/cinder-snap.conf.j2 @@ -22,6 +22,9 @@ volume_group = {{ lvm_backend_volume_group }} volume_backend_name=lvm-loop-based {% endif %} +log_file = {{ snap_common }}/log/cinder.log +debug = {{ logging_debug }} + [oslo_concurrency] # Oslo Concurrency lock path lock_path = {{ snap_common }}/lock diff --git a/snap-overlay/templates/glance-snap.conf.j2 b/snap-overlay/templates/glance-snap.conf.j2 index 8a5e94d..1e1c610 100644 --- a/snap-overlay/templates/glance-snap.conf.j2 +++ b/snap-overlay/templates/glance-snap.conf.j2 @@ -4,6 +4,9 @@ state_path = {{ snap_common }}/lib # Log to systemd journal use_journal = True +log_file = {{ snap_common }}/log/glance.log +debug = {{ logging_debug }} + [oslo_concurrency] # Oslo Concurrency lock path lock_path = {{ snap_common }}/lock diff --git a/snap-overlay/templates/horizon-snap.conf.j2 b/snap-overlay/templates/horizon-snap.conf.j2 index 196f315..b59b400 100644 --- a/snap-overlay/templates/horizon-snap.conf.j2 +++ b/snap-overlay/templates/horizon-snap.conf.j2 @@ -4,6 +4,9 @@ state_path = {{ snap_common }}/lib # Log to systemd journal use_journal = True +log_file = {{ snap_common }}/log/horizon.log +debug = {{ logging_debug }} + [oslo_concurrency] # Oslo Concurrency lock path lock_path = {{ snap_common }}/lock diff --git a/snap-overlay/templates/keystone-snap.conf.j2 b/snap-overlay/templates/keystone-snap.conf.j2 index 0ef6927..3d9ebb3 100644 --- a/snap-overlay/templates/keystone-snap.conf.j2 +++ b/snap-overlay/templates/keystone-snap.conf.j2 @@ -4,6 +4,9 @@ state_path = {{ snap_common }}/lib # Log to systemd journal use_journal = True +log_file = {{ snap_common }}/log/keystone.log +debug = {{ logging_debug }} + [oslo_concurrency] # Oslo Concurrency lock path lock_path = {{ snap_common }}/lock diff --git a/snap-overlay/templates/neutron-snap.conf.j2 b/snap-overlay/templates/neutron-snap.conf.j2 index 2d089db..3f72448 100644 --- a/snap-overlay/templates/neutron-snap.conf.j2 +++ b/snap-overlay/templates/neutron-snap.conf.j2 @@ -4,6 +4,10 @@ state_path = {{ snap_common }}/lib # Log to systemd journal use_journal = True +log_file = {{ snap_common }}/log/neutron.log +debug = {{ logging_debug }} + + {% if dns_domain %} dns_domain = {{ dns_domain }} {% endif %} diff --git a/snap-overlay/templates/nginx.conf.j2 b/snap-overlay/templates/nginx.conf.j2 index a62b8c5..83155a8 100644 --- a/snap-overlay/templates/nginx.conf.j2 +++ b/snap-overlay/templates/nginx.conf.j2 @@ -24,8 +24,12 @@ http { # Logging Settings ## - error_log syslog:server=unix:/dev/log; - access_log syslog:server=unix:/dev/log; +{% if logging_debug|lower == "true" %} + error_log {{ snap_common }}/log/nginx-error.log debug; +{% else %} + error_log {{ snap_common }}/log/nginx-error.log; +{% endif %} + access_log {{ snap_common }}/log/nginx-access.log; ## # Gzip Settings diff --git a/snap-overlay/templates/nova-snap.conf.j2 b/snap-overlay/templates/nova-snap.conf.j2 index fc43232..d9ecde9 100644 --- a/snap-overlay/templates/nova-snap.conf.j2 +++ b/snap-overlay/templates/nova-snap.conf.j2 @@ -12,6 +12,9 @@ use_journal = True host = {{ node_fqdn }} my_ip = {{ compute_ip }} +log_file = {{ snap_common }}/log/nova.log +debug = {{ logging_debug }} + [workarounds] disable_rootwrap = True diff --git a/snap-overlay/templates/placement-snap.conf.j2 b/snap-overlay/templates/placement-snap.conf.j2 index 196f315..8bbe791 100644 --- a/snap-overlay/templates/placement-snap.conf.j2 +++ b/snap-overlay/templates/placement-snap.conf.j2 @@ -4,6 +4,9 @@ state_path = {{ snap_common }}/lib # Log to systemd journal use_journal = True +log_file = {{ snap_common }}/log/placement.log +debug = {{ logging_debug }} + [oslo_concurrency] # Oslo Concurrency lock path lock_path = {{ snap_common }}/lock