diff options
| author | Zuul <zuul@review.opendev.org> | 2025-12-30 13:07:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2025-12-30 13:07:04 +0000 |
| commit | 35e61acc6beab92d2f1286f569ae694f4192f1b3 (patch) | |
| tree | 4623e657f8a2a0fcca28e15e8efcc5b49c0e6f60 | |
| parent | 7236849ee40d136b3c796080167f259e7b110597 (diff) | |
| parent | 43559c3db7965f0a46199629aef261fd1106c89a (diff) | |
| download | kolla-ansible-35e61acc6beab92d2f1286f569ae694f4192f1b3.tar.gz kolla-ansible-35e61acc6beab92d2f1286f569ae694f4192f1b3.zip | |
Merge "Remove glance-tls-proxy remnants"
| -rw-r--r-- | ansible/roles/cron/tasks/config.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/glance/handlers/main.yml | 14 | ||||
| -rwxr-xr-x | tests/check-logs.sh | 3 |
3 files changed, 2 insertions, 16 deletions
diff --git a/ansible/roles/cron/tasks/config.yml b/ansible/roles/cron/tasks/config.yml index 9ea3c92fb..46b606c25 100644 --- a/ansible/roles/cron/tasks/config.yml +++ b/ansible/roles/cron/tasks/config.yml @@ -46,7 +46,6 @@ - { name: "etcd", enabled: "{{ enable_etcd | bool }}" } - { name: "fluentd", enabled: "{{ enable_fluentd | bool }}" } - { name: "glance", enabled: "{{ enable_glance | bool }}" } - - { name: "glance-tls-proxy", enabled: "{{ glance_enable_tls_backend | bool }}" } - { name: "gnocchi", enabled: "{{ enable_gnocchi | bool }}" } - { name: "grafana", enabled: "{{ enable_grafana | bool }}" } - { name: "hacluster", enabled: "{{ enable_hacluster | bool }}" } diff --git a/ansible/roles/glance/handlers/main.yml b/ansible/roles/glance/handlers/main.yml index 3adcf4fae..58788ca96 100644 --- a/ansible/roles/glance/handlers/main.yml +++ b/ansible/roles/glance/handlers/main.yml @@ -14,17 +14,3 @@ volumes: "{{ service.volumes | reject('equalto', '') | list }}" dimensions: "{{ service.dimensions }}" healthcheck: "{{ service.healthcheck | default(omit) }}" - -- name: Restart glance-tls-proxy container - vars: - service_name: "glance-tls-proxy" - service: "{{ glance_services[service_name] }}" - become: true - kolla_container: - action: "recreate_or_restart_container" - common_options: "{{ docker_common_options }}" - name: "{{ service.container_name }}" - image: "{{ service.image }}" - volumes: "{{ service.volumes | reject('equalto', '') | list }}" - dimensions: "{{ service.dimensions }}" - healthcheck: "{{ service.healthcheck | default(omit) }}" diff --git a/tests/check-logs.sh b/tests/check-logs.sh index c9953982c..650f2d7b2 100755 --- a/tests/check-logs.sh +++ b/tests/check-logs.sh @@ -42,6 +42,7 @@ function check_fluentd_missing_logs { /var/log/kolla/fluentd/fluentd.log) continue ;; + # TODO(mnasiadka): Remove me after G/2026.1 release /var/log/kolla/glance-tls-proxy/glance-tls-proxy.log) continue ;; @@ -69,7 +70,7 @@ function check_fluentd_missing_logs { /var/log/kolla/neutron/dnsmasq.log) continue ;; - # TODO(mnasiadka): Remove me in Gazpacho release + # TODO(mnasiadka): Remove me after G/2026.1 release /var/log/kolla/neutron-tls-proxy/neutron-tls-proxy.log) continue ;; |