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/wallaby4dca2a4834
Allow tuning rpc_response_timeout263fee246a
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 commit4d23590ca0
) (cherry picked from commit2aa408f465
) (cherry picked from commitff1c593f0f
)
This commit is contained in:
parent
6127033cb7
commit
d8d2b49041
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user