Merge "Ceilometer: Remove incomplete cache parameters"

deployment/ceilometer/ceilometer-base-container-puppet.yaml

@@ -75,14 +75,6 @@ parameters:
     default: 60
     description: Ceilometer's RPC response timeout, in seconds.
     type: number
-  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
 
 outputs:
   role_data:
@@ -113,11 +105,6 @@ outputs:
             ceilometer::host: "%{hiera('fqdn_canonical')}"
             ceilometer::rpc_response_timeout: {get_param: CeilometerRpcResponseTimeout}
             ceilometer::db::sync_db: false
-          - if:
-            - {get_param: MemcachedTLS}
-            - ceilometer::cache_backend: 'dogpile.cache.pymemcache'
-              ceilometer::cache_tls_enabled: true
-              ceilometer::cache_enable_socket_keepalive: true
       service_config_settings:
         keystone:
           # Enable default notification queue