openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix Barbican API log config"

Browse Source
This commit is contained in:
Zuul 2021-02-15 22:24:57 +00:00 committed by Gerrit Code Review
commit 2b906bc382
6 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/roles/barbican/templates/barbican-api.ini.j2
View File

@ -12,3 +12,4 @@ memory-report = true
plugins = python3 plugins = python3
paste = config:/etc/barbican/barbican-api-paste.ini paste = config:/etc/barbican/barbican-api-paste.ini
add-header = Connection: close add-header = Connection: close
logto = /var/log/kolla/barbican/barbican_api_uwsgi_access.log

2
ansible/roles/barbican/templates/barbican-api.json.j2
View File

@ -1,5 +1,5 @@
{ {
"command": "uwsgi --master --emperor /etc/barbican/vassals --logto /var/log/kolla/barbican/barbican-api.log --logfile-chmod 644", "command": "uwsgi --master --emperor /etc/barbican/vassals --logto /var/log/kolla/barbican/barbican_api_uwsgi_access.log --logfile-chmod 644",
"config_files": [ "config_files": [
{ {
"source": "{{ container_config_directory }}/barbican.conf", "source": "{{ container_config_directory }}/barbican.conf",

3
ansible/roles/barbican/templates/barbican.conf.j2
View File

@ -1,6 +1,9 @@
[DEFAULT] [DEFAULT]
debug = {{ barbican_logging_debug }} debug = {{ barbican_logging_debug }}
log_dir = /var/log/kolla/barbican log_dir = /var/log/kolla/barbican
{% if service_name == "barbican-api" %}
log_file = barbican-api.log
{% endif %}
bind_port = {{ barbican_api_listen_port }} bind_port = {{ barbican_api_listen_port }}
bind_host = {{ api_interface_address }} bind_host = {{ api_interface_address }}

4
ansible/roles/common/templates/conf/filter/01-rewrite-0.12.conf.j2
View File

@ -2,7 +2,7 @@
@type rewrite_tag_filter @type rewrite_tag_filter
capitalize_regex_backreference yes capitalize_regex_backreference yes
rewriterule1 programname ^(cinder-api-access|cloudkitty-api-access|gnocchi-api-access|horizon-access|keystone-apache-admin-access|keystone-apache-public-access|monasca-api-access|placement-api-access|panko-api-access)$ apache_access rewriterule1 programname ^(cinder-api-access|cloudkitty-api-access|gnocchi-api-access|horizon-access|keystone-apache-admin-access|keystone-apache-public-access|monasca-api-access|placement-api-access|panko-api-access)$ apache_access
rewriterule2 programname ^(aodh_wsgi_access|barbican-api|zun_api_wsgi_access|vitrage_wsgi_access)$ wsgi_access rewriterule2 programname ^(aodh_wsgi_access|barbican_api_uwsgi_access|zun_api_wsgi_access|vitrage_wsgi_access)$ wsgi_access
rewriterule3 programname ^(nova-api|nova-compute|nova-compute-ironic|nova-conductor|nova-manage|nova-novncproxy|nova-scheduler|nova-placement-api|placement-api|privsep-helper)$ openstack_python rewriterule3 programname ^(nova-api|nova-compute|nova-compute-ironic|nova-conductor|nova-manage|nova-novncproxy|nova-scheduler|nova-placement-api|placement-api|privsep-helper)$ openstack_python
rewriterule4 programname ^(sahara-api|sahara-engine)$ openstack_python rewriterule4 programname ^(sahara-api|sahara-engine)$ openstack_python
rewriterule5 programname ^(neutron-server|neutron-openvswitch-agent|neutron-ns-metadata-proxy|neutron-metadata-agent|neutron-l3-agent|neutron-dhcp-agent)$ openstack_python rewriterule5 programname ^(neutron-server|neutron-openvswitch-agent|neutron-ns-metadata-proxy|neutron-metadata-agent|neutron-l3-agent|neutron-dhcp-agent)$ openstack_python
@ -12,7 +12,7 @@
rewriterule9 programname ^(glance-api)$ openstack_python rewriterule9 programname ^(glance-api)$ openstack_python
rewriterule10 programname ^(cloudkitty-storage-init|cloudkitty-processor|cloudkitty-dbsync|cloudkitty-api)$ openstack_python rewriterule10 programname ^(cloudkitty-storage-init|cloudkitty-processor|cloudkitty-dbsync|cloudkitty-api)$ openstack_python
rewriterule11 programname ^(ceilometer-polling|ceilometer-agent-notification)$ openstack_python rewriterule11 programname ^(ceilometer-polling|ceilometer-agent-notification)$ openstack_python
rewriterule12 programname ^(barbican-worker|barbican-keystone-listener|barbican-db-manage|app)$ openstack_python rewriterule12 programname ^(barbican-api|barbican-worker|barbican-keystone-listener|barbican-db-manage|app)$ openstack_python
rewriterule13 programname ^(aodh-notifier|aodh-listener|aodh-evaluator|aodh-dbsync)$ openstack_python rewriterule13 programname ^(aodh-notifier|aodh-listener|aodh-evaluator|aodh-dbsync)$ openstack_python
rewriterule14 programname ^(cinder-api|cinder-scheduler|cinder-manage|cinder-volume|cinder-backup|privsep-helper)$ openstack_python rewriterule14 programname ^(cinder-api|cinder-scheduler|cinder-manage|cinder-volume|cinder-backup|privsep-helper)$ openstack_python
rewriterule15 programname ^(mistral-server|mistral-engine|mistral-executor)$ openstack_python rewriterule15 programname ^(mistral-server|mistral-engine|mistral-executor)$ openstack_python

4
ansible/roles/common/templates/conf/filter/01-rewrite-0.14.conf.j2
View File

@ -8,7 +8,7 @@
</rule> </rule>
<rule> <rule>
key programname key programname
pattern ^(aodh_wsgi_access|barbican-api|zun_api_wsgi_access|vitrage_wsgi_access)$ pattern ^(aodh_wsgi_access|barbican_api_uwsgi_access|zun_api_wsgi_access|vitrage_wsgi_access)$
tag wsgi_access tag wsgi_access
</rule> </rule>
<rule> <rule>
@ -58,7 +58,7 @@
</rule> </rule>
<rule> <rule>
key programname key programname
pattern ^(barbican-worker|barbican-keystone-listener|barbican-db-manage|app)$ pattern ^(barbican-api|barbican-worker|barbican-keystone-listener|barbican-db-manage|app)$
tag openstack_python tag openstack_python
</rule> </rule>
<rule> <rule>

5
releasenotes/notes/fix-barbican-logging-42068f47fe1e4e4d.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
Fixes some configuration issues around Barbican logging. `LP#1891343
<https://bugs.launchpad.net/kolla-ansible/+bug/1891343>`__