openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix glance-tls-proxy logrotate and fluentd log permissions"

Browse Source
This commit is contained in:
Zuul 2020-09-21 09:04:53 +00:00 committed by Gerrit Code Review
commit cccfa8f378
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/group_vars/all.yml
View File

@ -842,6 +842,8 @@ glance_enable_rolling_upgrade: "no"
glance_enable_property_protection: "no" glance_enable_property_protection: "no"
glance_enable_interoperable_image_import: "no" glance_enable_interoperable_image_import: "no"
glance_api_hosts: "{{ [groups['glance-api']|first] if glance_backend_file | bool and glance_file_datadir_volume == 'glance' else groups['glance-api'] }}" glance_api_hosts: "{{ [groups['glance-api']|first] if glance_backend_file | bool and glance_file_datadir_volume == 'glance' else groups['glance-api'] }}"
# NOTE(mnasiadka): For use in common role
glance_enable_tls_backend: "{{ kolla_enable_tls_backend }}"
glance_admin_endpoint: "{{ admin_protocol }}://{{ glance_internal_fqdn | put_address_in_context('url') }}:{{ glance_api_port }}" glance_admin_endpoint: "{{ admin_protocol }}://{{ glance_internal_fqdn | put_address_in_context('url') }}:{{ glance_api_port }}"
glance_internal_endpoint: "{{ internal_protocol }}://{{ glance_internal_fqdn | put_address_in_context('url') }}:{{ glance_api_port }}" glance_internal_endpoint: "{{ internal_protocol }}://{{ glance_internal_fqdn | put_address_in_context('url') }}:{{ glance_api_port }}"

2
ansible/roles/common/tasks/config.yml
View File

@ -181,7 +181,7 @@
- { name: "fluentd", enabled: "{{ enable_fluentd | bool }}" } - { name: "fluentd", enabled: "{{ enable_fluentd | bool }}" }
- { name: "freezer", enabled: "{{ enable_freezer | bool }}" } - { name: "freezer", enabled: "{{ enable_freezer | bool }}" }
- { name: "glance", enabled: "{{ enable_glance | bool }}" } - { name: "glance", enabled: "{{ enable_glance | bool }}" }
- { name: "glance-tls-proxy", enabled: "{{ enable_glance | bool }}" } - { name: "glance-tls-proxy", enabled: "{{ glance_enable_tls_backend | bool }}" }
- { name: "gnocchi", enabled: "{{ enable_gnocchi | bool }}" } - { name: "gnocchi", enabled: "{{ enable_gnocchi | bool }}" }
- { name: "grafana", enabled: "{{ enable_grafana | bool }}" } - { name: "grafana", enabled: "{{ enable_grafana | bool }}" }
- { name: "haproxy", enabled: "{{ enable_haproxy | bool }}" } - { name: "haproxy", enabled: "{{ enable_haproxy | bool }}" }

2
ansible/roles/common/templates/conf/output/00-local.conf.j2
View File

@ -120,6 +120,7 @@
{% endif %} {% endif %}
</match> </match>
{% if glance_enable_tls_backend | bool %}
<match syslog.{{ syslog_glance_tls_proxy_facility }}.**> <match syslog.{{ syslog_glance_tls_proxy_facility }}.**>
@type copy @type copy
<store> <store>
@ -178,3 +179,4 @@
</store> </store>
{% endif %} {% endif %}
</match> </match>
{% endif %}

7
ansible/roles/common/templates/fluentd.json.j2
View File

@ -34,6 +34,13 @@
"owner": "{{ fluentd_user }}:{{ fluentd_user }}", "owner": "{{ fluentd_user }}:{{ fluentd_user }}",
"recurse": true "recurse": true
}, },
{% if glance_enable_tls_backend | bool %}
{
"path": "/var/log/kolla/glance-tls-proxy",
"owner": "{{ fluentd_user }}:{{ fluentd_user }}",
"recurse": true
},
{% endif %}
{ {
"path": "/var/log/kolla/swift", "path": "/var/log/kolla/swift",
"owner": "{{ fluentd_user }}:{{ fluentd_user }}", "owner": "{{ fluentd_user }}:{{ fluentd_user }}",

5
ansible/roles/glance/defaults/main.yml
View File

@ -209,11 +209,6 @@ vmware_datastore_name:
# Default maximum size of 10Gb # Default maximum size of 10Gb
glance_cache_max_size: "10737418240" glance_cache_max_size: "10737418240"
####################
# TLS
####################
glance_enable_tls_backend: "{{ kolla_enable_tls_backend }}"
#################### ####################
# Backend TLS proxy # Backend TLS proxy
#################### ####################