diff options
| author | Zuul <zuul@review.openstack.org> | 2018-07-03 07:24:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-07-03 07:24:58 +0000 |
| commit | 34d424a3eefb11a717534d756f4712bbf6dd7df1 (patch) | |
| tree | 978e433918c1d8a7083190acecbab52a6378d599 /ansible | |
| parent | f715a97558ae44e4c8b494c8127a0bf2ebfa0198 (diff) | |
| parent | cebb77d7e218d0978519288d0d4071c451e26c92 (diff) | |
| download | kolla-ansible-34d424a3eefb11a717534d756f4712bbf6dd7df1.tar.gz kolla-ansible-34d424a3eefb11a717534d756f4712bbf6dd7df1.zip | |
Merge "Make Swift log_level changeable"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/swift/defaults/main.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/swift/templates/account.conf.j2 | 2 | ||||
| -rw-r--r-- | ansible/roles/swift/templates/container.conf.j2 | 2 | ||||
| -rw-r--r-- | ansible/roles/swift/templates/object.conf.j2 | 2 | ||||
| -rw-r--r-- | ansible/roles/swift/templates/proxy-server.conf.j2 | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/ansible/roles/swift/defaults/main.yml b/ansible/roles/swift/defaults/main.yml index d433fbe51..ec8402784 100644 --- a/ansible/roles/swift/defaults/main.yml +++ b/ansible/roles/swift/defaults/main.yml @@ -31,6 +31,8 @@ swift_rsyncd_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ do swift_rsyncd_tag: "{{ swift_tag }}" swift_rsyncd_image_full: "{{ swift_rsyncd_image }}:{{ swift_rsyncd_tag }}" +swift_log_level: "{{ 'INFO' if openstack_logging_debug == 'False' else 'DEBUG'}}" + #################### # OpenStack #################### diff --git a/ansible/roles/swift/templates/account.conf.j2 b/ansible/roles/swift/templates/account.conf.j2 index 9863eda51..36b2d7367 100644 --- a/ansible/roles/swift/templates/account.conf.j2 +++ b/ansible/roles/swift/templates/account.conf.j2 @@ -7,7 +7,7 @@ log_udp_host = {{ syslog_server }} log_udp_port = {{ syslog_udp_port }} log_name = {{ service_name }} log_facility = {{ syslog_swift_facility }} -log_level = INFO +log_level = {{ swift_log_level }} workers = {{ openstack_service_workers }} [pipeline:main] diff --git a/ansible/roles/swift/templates/container.conf.j2 b/ansible/roles/swift/templates/container.conf.j2 index 1cbc62752..a12537580 100644 --- a/ansible/roles/swift/templates/container.conf.j2 +++ b/ansible/roles/swift/templates/container.conf.j2 @@ -7,7 +7,7 @@ log_udp_host = {{ syslog_server }} log_udp_port = {{ syslog_udp_port }} log_name = {{ service_name }} log_facility = {{ syslog_swift_facility }} -log_level = INFO +log_level = {{ swift_log_level }} workers = {{ openstack_service_workers }} [pipeline:main] diff --git a/ansible/roles/swift/templates/object.conf.j2 b/ansible/roles/swift/templates/object.conf.j2 index d2513255d..204a9a0bb 100644 --- a/ansible/roles/swift/templates/object.conf.j2 +++ b/ansible/roles/swift/templates/object.conf.j2 @@ -8,7 +8,7 @@ log_udp_host = {{ syslog_server }} log_udp_port = {{ syslog_udp_port }} log_name = {{ service_name }} log_facility = {{ syslog_swift_facility }} -log_level = INFO +log_level = {{ swift_log_level }} workers = {{ openstack_service_workers }} [pipeline:main] diff --git a/ansible/roles/swift/templates/proxy-server.conf.j2 b/ansible/roles/swift/templates/proxy-server.conf.j2 index efe81d32a..ecfe735be 100644 --- a/ansible/roles/swift/templates/proxy-server.conf.j2 +++ b/ansible/roles/swift/templates/proxy-server.conf.j2 @@ -6,7 +6,7 @@ log_udp_host = {{ syslog_server }} log_udp_port = {{ syslog_udp_port }} log_name = {{ service_name }} log_facility = {{ syslog_swift_facility }} -log_level = INFO +log_level = {{ swift_log_level }} workers = {{ openstack_service_workers }} [pipeline:main] |