From d8d2b49041dbbadf962558a513fb0aaca37fb8ed Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 15 Mar 2022 14:57:15 +0900 Subject: [PATCH] Ceilometer: Remove incomplete cache parameters Currently when TLS for memcached service is enabled, caching in ceilometer is enabled. However the configuration is incomplete and the pymemcache backend is used with no actual backend server. This change removes the cache parameters completely, as we had never enabled caching in Ceilometer previously. (to wallaby) Conflicts: deployment/ceilometer/ceilometer-base-container-puppet.yaml Resolved conflicts caused by the following two changes which are not present in stable/wallaby 4dca2a4834e95cfcc9690a1e258c90fb5ee3b1e1 Allow tuning rpc_response_timeout 263fee246a4214f4c56c675cd1245ea77a3cd9ea Ensure db initialization is not executed by puppet (to victoria) Conflicts: deployment/ceilometer/ceilometer-base-container-puppet.yaml Closes-Bug: #1964873 Change-Id: Idae2ba0cd9a35044c124a6d05ee050e10adde60e (cherry picked from commit 4d23590ca0d1735497ff483c5837e86e4502850f) (cherry picked from commit 2aa408f465015c0e99f269da779ef19c68300534) (cherry picked from commit ff1c593f0fa04bf7f982bfe101578920d2912c77) --- .../ceilometer-base-container-puppet.yaml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/deployment/ceilometer/ceilometer-base-container-puppet.yaml b/deployment/ceilometer/ceilometer-base-container-puppet.yaml index b31c0d70fa..ea08309708 100644 --- a/deployment/ceilometer/ceilometer-base-container-puppet.yaml +++ b/deployment/ceilometer/ceilometer-base-container-puppet.yaml @@ -76,14 +76,6 @@ parameters: type: string default: 'noop' description: Driver or drivers to handle sending notifications. - MemcachedTLS: - default: false - description: Set to True to enable TLS on Memcached service. - Because not all services support Memcached TLS, during the - migration period, Memcached will listen on 2 ports - on the - port set with MemcachedPort parameter (above) and on 11211, - without TLS. - type: boolean GnocchiArchivePolicy: default: 'ceilometer-low-rate' type: string @@ -130,11 +122,6 @@ outputs: ceilometer::snmpd_readonly_username: {get_param: SnmpdReadonlyUserName} ceilometer::snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword} ceilometer::host: "%{hiera('fqdn_canonical')}" - - if: - - {get_param: MemcachedTLS} - - ceilometer::cache_backend: 'dogpile.cache.pymemcache' - ceilometer::cache_tls_enabled: true - - {} service_config_settings: keystone: # Enable default notification queue