openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix zun-api logging and state_path"

Browse Source
This commit is contained in:
Jenkins 2017-07-25 13:07:44 +00:00 committed by Gerrit Code Review
commit 24c4e910e4
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,6 @@
rewriterule22 programname ^(watcher-api|watcher-applier|watcher-db-manage|watcher-decision-engine).* openstack_python rewriterule22 programname ^(watcher-api|watcher-applier|watcher-db-manage|watcher-decision-engine).* openstack_python
rewriterule23 programname ^(freezer-api|freezer-api_access|freezer-manage).* openstack_python rewriterule23 programname ^(freezer-api|freezer-api_access|freezer-manage).* openstack_python
rewriterule24 programname ^(octavia-api|octavia-health-manager|octavia-housekeeping|octavia-worker).* openstack_python rewriterule24 programname ^(octavia-api|octavia-health-manager|octavia-housekeeping|octavia-worker).* openstack_python
rewriterule25 programname ^(zun-compute).* openstack_python rewriterule25 programname ^(zun-api|zun-compute).* openstack_python
rewriterule26 programname ^(kuryr-server).* openstack_python rewriterule26 programname ^(kuryr-server).* openstack_python
</match> </match>

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

@ -26,7 +26,7 @@
"permissions": [ "permissions": [
{ {
"path": "/var/log/kolla/zun", "path": "/var/log/kolla/zun",
"owner": "zun:zun", "owner": "zun:kolla",
"recurse": true "recurse": true
} }
] ]

2
ansible/roles/zun/templates/zun-compute.json.j2
View File

@ -18,7 +18,7 @@
"permissions": [ "permissions": [
{ {
"path": "/var/log/kolla/zun", "path": "/var/log/kolla/zun",
"owner": "zun:zun", "owner": "zun:kolla",
"recurse": true "recurse": true
} }
] ]

8
ansible/roles/zun/templates/zun.conf.j2
View File

@ -1,8 +1,15 @@
[DEFAULT] [DEFAULT]
debug = {{ zun_logging_debug }} debug = {{ zun_logging_debug }}
{% if service_name == 'zun-api' %}
# Force zun-api.log or will use app.wsgi
log_file = /var/log/kolla/zun/zun-api.log
{% endif %}
log_dir = /var/log/kolla/zun log_dir = /var/log/kolla/zun
transport_url = rabbit://{% for host in groups['rabbitmq'] %}{{ rabbitmq_user }}:{{ rabbitmq_password }}@{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}{{ rabbitmq_port }}{% if not loop.last %},{% endif %}{% endfor %} transport_url = rabbit://{% for host in groups['rabbitmq'] %}{{ rabbitmq_user }}:{{ rabbitmq_password }}@{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}{{ rabbitmq_port }}{% if not loop.last %},{% endif %}{% endfor %}
state_path = /var/lib/zun
container_driver = docker.driver.DockerDriver container_driver = docker.driver.DockerDriver
image_driver_list = glance image_driver_list = glance
db_type = sql db_type = sql
@ -67,7 +74,6 @@ username = {{ zun_keystone_user }}
password = {{ zun_keystone_password }} password = {{ zun_keystone_password }}
region_name = {{ openstack_region_name }} region_name = {{ openstack_region_name }}
endpoint_type = internalURL endpoint_type = internalURL
api_version = 2
[neutron_client] [neutron_client]
auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }} auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}