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