Add EnableCache option to enable/disable usage of memcache

Depends-on: https://review.opendev.org/#/c/725020/
Change-Id: Id92c13a591f64b1084cbe4c48f2879d791f66cfe

deployment/heat/heat-base-puppet.yaml

@@ -48,6 +48,10 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
+  EnableCache:
+    description: Enable caching with memcached
+    type: boolean
+    default: true
   HeatCronPurgeDeletedEnsure:
     type: string
     description: >
@@ -131,6 +135,7 @@ parameters:
 
 conditions:
   service_debug_unset: {equals : [{get_param: HeatDebug}, '']}
+  cache_enabled: {equals : [{get_param: EnableCache}, true]}
   cors_allowed_origin_unset: {equals : [{get_param: HeatCorsAllowedOrigin}, '']}
 
 outputs:
@@ -163,9 +168,6 @@ outputs:
             heat::keystone::authtoken::password: {get_param: HeatPassword}
             heat::keystone::authtoken::region_name: {get_param: KeystoneRegion}
             heat::heat_keystone_clients_url: {get_param: [EndpointMap, KeystonePublic, uri_no_suffix] }
-            heat::cache::enabled: true
-            heat::cache::backend: 'dogpile.cache.memcached'
-            heat::cache::resource_finder_caching: false
             heat::keystone::domain::domain_name: 'heat_stack'
             heat::keystone::domain::domain_admin: 'heat_stack_domain_admin'
             heat::keystone::domain::domain_admin_email: 'heat_stack_domain_admin@localhost'
@@ -188,3 +190,10 @@ outputs:
             heat::cron::purge_deleted::age_type: {get_param: HeatCronPurgeDeletedAgeType}
             heat::cron::purge_deleted::destination: {get_param: HeatCronPurgeDeletedDestination}
             heat::max_json_body_size: {get_param: HeatMaxJsonBodySize}
+          -
+            if:
+            - cache_enabled
+            - heat::cache::enabled: true
+              heat::cache::backend: 'dogpile.cache.memcached'
+              heat::cache::resource_finder_caching: false
+            - {}

deployment/keystone/keystone-container-puppet.yaml

@@ -88,6 +88,10 @@ parameters:
     type: string
     constraints:
       - allowed_values: [ '', 'true', 'True', 'TRUE', 'false', 'False', 'FALSE']
+  EnableCache:
+    description: Enable caching with memcached
+    type: boolean
+    default: true
   EnableSQLAlchemyCollectd:
     type: boolean
     description: >
@@ -320,6 +324,7 @@ conditions:
   keystone_federation_enabled: {equals: [{get_param: KeystoneFederationEnable}, True]}
   keystone_openidc_enabled: {equals: [{get_param: KeystoneOpenIdcEnable}, True]}
   service_debug_unset: {equals : [{get_param: KeystoneDebug}, '']}
+  cache_enabled: {equals: [{get_param: EnableCache}, true]}
   enable_sqlalchemy_collectd: {equals : [{get_param: EnableSQLAlchemyCollectd}, true]}
 
   # Security compliance
@@ -409,8 +414,6 @@ outputs:
             keystone::rabbit_heartbeat_timeout_threshold: 60
             keystone::bootstrap::service_project_name: 'service'
             keystone::bootstrap::project_name: 'admin'
-            keystone::cache_enabled: true
-            keystone::cache_backend: 'dogpile.cache.memcached'
             keystone::config::keystone_config:
               ec2/driver:
                 value: 'keystone.contrib.ec2.backends.sql.Ec2'
@@ -456,6 +459,12 @@ outputs:
                     "%{hiera('$NETWORK')}"
                   params:
                     $NETWORK: {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]}
+          -
+            if:
+            - cache_enabled
+            - keystone::cache_enabled: true
+              keystone::cache_backend: 'dogpile.cache.memcached'
+            - {}
           -
             if:
             - keystone_federation_enabled
@@ -468,30 +477,35 @@ outputs:
             if:
             - keystone_openidc_enabled
             -
-              keystone_openidc_enabled: True
-              keystone::federation::openidc::methods:
-                get_param: KeystoneAuthMethods
-              keystone::federation::openidc::keystone_url:
-                get_param: [EndpointMap, KeystonePublic, uri_no_suffix]
-              keystone::federation::openidc::idp_name:
-                get_param: KeystoneOpenIdcIdpName
-              keystone::federation::openidc::openidc_provider_metadata_url:
-                get_param: KeystoneOpenIdcProviderMetadataUrl
-              keystone::federation::openidc::openidc_client_id:
-                get_param: KeystoneOpenIdcClientId
-              keystone::federation::openidc::openidc_client_secret:
-                get_param: KeystoneOpenIdcClientSecret
-              keystone::federation::openidc::openidc_crypto_passphrase:
-                get_param: KeystoneOpenIdcCryptoPassphrase
-              keystone::federation::openidc::openidc_response_type:
-                get_param: KeystoneOpenIdcResponseType
-              keystone::federation::openidc::remote_id_attribute:
-                get_param: KeystoneOpenIdcRemoteIdAttribute
-              keystone::federation::openidc::openidc_enable_oauth:
-                get_param: KeystoneOpenIdcEnableOAuth
-              keystone::federation::openidc::openidc_introspection_endpoint:
-                get_param: KeystoneOpenIdcIntrospectionEndpoint
-              keystone::federation::openidc::openidc_cache_type: 'memcache'
+              map_merge:
+                - keystone_openidc_enabled: True
+                  keystone::federation::openidc::methods:
+                    get_param: KeystoneAuthMethods
+                  keystone::federation::openidc::keystone_url:
+                    get_param: [EndpointMap, KeystonePublic, uri_no_suffix]
+                  keystone::federation::openidc::idp_name:
+                    get_param: KeystoneOpenIdcIdpName
+                  keystone::federation::openidc::openidc_provider_metadata_url:
+                    get_param: KeystoneOpenIdcProviderMetadataUrl
+                  keystone::federation::openidc::openidc_client_id:
+                    get_param: KeystoneOpenIdcClientId
+                  keystone::federation::openidc::openidc_client_secret:
+                    get_param: KeystoneOpenIdcClientSecret
+                  keystone::federation::openidc::openidc_crypto_passphrase:
+                    get_param: KeystoneOpenIdcCryptoPassphrase
+                  keystone::federation::openidc::openidc_response_type:
+                    get_param: KeystoneOpenIdcResponseType
+                  keystone::federation::openidc::remote_id_attribute:
+                    get_param: KeystoneOpenIdcRemoteIdAttribute
+                  keystone::federation::openidc::openidc_enable_oauth:
+                    get_param: KeystoneOpenIdcEnableOAuth
+                  keystone::federation::openidc::openidc_introspection_endpoint:
+                    get_param: KeystoneOpenIdcIntrospectionEndpoint
+                -
+                  if:
+                  - cache_enabled
+                  - keystone::federation::openidc::openidc_cache_type: 'memcache'
+                  - {}
             - {}
           -
             if:

deployment/nova/nova-base-puppet.yaml

@@ -77,6 +77,10 @@ parameters:
     type: string
     constraints:
       - allowed_values: [ '', 'true', 'True', 'TRUE', 'false', 'False', 'FALSE']
+  EnableCache:
+    description: Enable caching with memcached
+    type: boolean
+    default: true
   EnableSQLAlchemyCollectd:
     type: boolean
     description: >
@@ -252,6 +256,7 @@ conditions:
 
   compute_upgrade_level_empty: {equals : [{get_param: UpgradeLevelNovaCompute}, '']}
   service_debug_unset: {equals : [{get_param: NovaDebug}, '']}
+  cache_enabled: {equals: [{get_param: EnableCache}, true]}
   enable_sqlalchemy_collectd: {equals : [{get_param: EnableSQLAlchemyCollectd}, true]}
 
 resources:
@@ -407,6 +412,12 @@ outputs:
           nova_is_additional_cell: {get_param: NovaAdditionalCell}
           nova::cross_az_attach: {get_param: NovaCrossAZAttach}
         - get_attr: [RoleParametersValue, value]
+        -
+          if:
+          - cache_enabled
+          - nova::cache::enabled: true
+            nova::cache::backend: 'dogpile.cache.memcached'
+          - {}
         -
           if:
           - compute_upgrade_level_empty

releasenotes/notes/enable-cache-293c39b3b6f55c80.yaml

@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    The new ``EnableCache`` parameter is added to enable/disable chacing using
+    memcached services. The parameter is true by default, but should be false
+    when memcached service is disabled in the deployment.