diff --git a/environments/enable-tls.yaml b/environments/enable-tls.yaml
index 175e1fd7e9..7d3796e7ca 100644
--- a/environments/enable-tls.yaml
+++ b/environments/enable-tls.yaml
@@ -12,5 +12,8 @@ parameter_defaults:
   SSLKey: |
     The contents of the private key go here
 
+  # Disable Gnocchi Incoming redis storage driver when using tls
+  GnocchiIncomingStorageDriver: ''
+
 resource_registry:
   OS::TripleO::NodeTLSData: ../puppet/extraconfig/tls/tls-cert-inject.yaml
diff --git a/puppet/services/gnocchi-api.yaml b/puppet/services/gnocchi-api.yaml
index 285a347fbb..f500768483 100644
--- a/puppet/services/gnocchi-api.yaml
+++ b/puppet/services/gnocchi-api.yaml
@@ -41,6 +41,10 @@ parameters:
     type: string
     constraints:
     - allowed_values: ['swift', 'file', 'rbd']
+  GnocchiIncomingStorageDriver:
+    default: redis
+    description: Storage driver to use for incoming metric data
+    type: string
   KeystoneRegion:
     type: string
     default: 'regionOne'
@@ -122,6 +126,7 @@ outputs:
                 params:
                   $NETWORK: {get_param: [ServiceNetMap, GnocchiApiNetwork]}
             tripleo::profile::base::gnocchi::api::gnocchi_backend: {get_param: GnocchiBackend}
+            tripleo::profile::base::gnocchi::api::incoming_storage_driver: {get_param: GnocchiIncomingStorageDriver}
             # NOTE: bind IP is found in Heat replacing the network name with the
             # local node IP for the given network; replacement examples
             # (eg. for internal_api):