diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 9e426b8e335a94545494c11ad18d0e055d388107..63fc13a98969ecc612beb0740d4849871a2cbaa2 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -541,6 +541,20 @@ elasticsearch_address: "{{ kolla_internal_fqdn }}"
 enable_elasticsearch: "{{ 'yes' if enable_central_logging | bool or enable_freezer | bool or enable_osprofiler | bool or enable_skydive | bool or enable_monasca | bool else 'no' }}"
 enable_kibana: "{{ 'yes' if enable_central_logging | bool else 'no' }}"
 
+####################
+# Redis options
+####################
+redis_address: "{{ kolla_internal_fqdn }}"
+
+####################
+# Osprofiler options
+####################
+# valid values: ["elasticsearch", "redis"]
+osprofiler_backend: "elasticsearch"
+elasticsearch_connection_string: "elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch_port }}"
+redis_connection_string: "redis://:{{ redis_master_password }}@{{ redis_address }}:{{ redis_port }}"
+osprofiler_backend_connection_string: "{{ redis_connection_string if osprofiler_backend == 'redis' else elasticsearch_connection_string }}"
+
 ####################
 # RabbitMQ options
 ####################
diff --git a/ansible/roles/cinder/templates/cinder.conf.j2 b/ansible/roles/cinder/templates/cinder.conf.j2
index 7396c8fcc7b711ad062a2089de91c4380325b1fc..1a6672f372b829efadf32be8805f04feedf3ea31 100644
--- a/ansible/roles/cinder/templates/cinder.conf.j2
+++ b/ansible/roles/cinder/templates/cinder.conf.j2
@@ -203,9 +203,7 @@ helper_command=sudo cinder-rootwrap /etc/cinder/rootwrap.conf privsep-helper --c
 enabled = true
 trace_sqlalchemy = true
 hmac_keys = {{ osprofiler_secret }}
-{% if enable_elasticsearch | bool %}
-connection_string = elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch_port }}
-{% endif %}
+connection_string = {{ osprofiler_backend_connection_string }}
 {% endif %}
 
 {% if enable_barbican | bool %}
diff --git a/ansible/roles/glance/templates/glance-api.conf.j2 b/ansible/roles/glance/templates/glance-api.conf.j2
index 85aee91a68029449ddb7871c4185ca9b1c66e70f..e0853fdadd5ec662fe862ba3e1d97afaab9864d3 100644
--- a/ansible/roles/glance/templates/glance-api.conf.j2
+++ b/ansible/roles/glance/templates/glance-api.conf.j2
@@ -103,7 +103,5 @@ policy_file = {{ glance_policy_file }}
 enabled = true
 trace_sqlalchemy = true
 hmac_keys = {{ osprofiler_secret }}
-{% if enable_elasticsearch | bool %}
-connection_string = elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch_port }}
-{% endif %}
+connection_string = {{ osprofiler_backend_connection_string }}
 {% endif %}
diff --git a/ansible/roles/glance/templates/glance-registry.conf.j2 b/ansible/roles/glance/templates/glance-registry.conf.j2
index 537fe28d9c0f253bef5d23e15f061f1ee95a1ccc..1780c318f7c44e8717d2a2177beb9e7826e9cdd7 100644
--- a/ansible/roles/glance/templates/glance-registry.conf.j2
+++ b/ansible/roles/glance/templates/glance-registry.conf.j2
@@ -50,7 +50,5 @@ policy_file = {{ glance_policy_file }}
 enabled = true
 trace_sqlalchemy = true
 hmac_keys = {{ osprofiler_secret }}
-{% if enable_elasticsearch | bool %}
-connection_string = elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch_port }}
-{% endif %}
+connection_string = {{ osprofiler_backend_connection_string }}
 {% endif %}
diff --git a/ansible/roles/heat/templates/heat.conf.j2 b/ansible/roles/heat/templates/heat.conf.j2
index b3fd768a79bd78dd5c815d479fde5c01653192f1..09a85eb7635ef5e9687f23fc8ea349b4f2447b5a 100644
--- a/ansible/roles/heat/templates/heat.conf.j2
+++ b/ansible/roles/heat/templates/heat.conf.j2
@@ -103,7 +103,5 @@ enable_proxy_headers_parsing = True
 enabled = true
 trace_sqlalchemy = true
 hmac_keys = {{ osprofiler_secret }}
-{% if enable_elasticsearch | bool %}
-connection_string = elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch_port }}
-{% endif %}
+connection_string = {{ osprofiler_backend_connection_string }}
 {% endif %}
diff --git a/ansible/roles/keystone/templates/keystone.conf.j2 b/ansible/roles/keystone/templates/keystone.conf.j2
index c6a5a67d80dd15136bab018e73fc3dc66601a99c..4ea8b85a5610d1b60ccf9dd3795949f33f609f9d 100644
--- a/ansible/roles/keystone/templates/keystone.conf.j2
+++ b/ansible/roles/keystone/templates/keystone.conf.j2
@@ -52,9 +52,7 @@ driver = messagingv2
 enabled = true
 trace_sqlalchemy = true
 hmac_keys = {{ osprofiler_secret }}
-{% if enable_elasticsearch | bool %}
-connection_string = elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch_port }}
-{% endif %}
+connection_string = {{ osprofiler_backend_connection_string }}
 {% endif %}
 
 {% if enable_grafana | bool %}
diff --git a/ansible/roles/magnum/templates/magnum.conf.j2 b/ansible/roles/magnum/templates/magnum.conf.j2
index 8d9aec4b39dcb0e57feda529ba125f92a089eaf1..48726d5b0e727765e0042b061f1c03535dd67cc2 100644
--- a/ansible/roles/magnum/templates/magnum.conf.j2
+++ b/ansible/roles/magnum/templates/magnum.conf.j2
@@ -103,7 +103,5 @@ policy_file = {{ magnum_policy_file }}
 enabled = true
 trace_sqlalchemy = true
 hmac_keys = {{ osprofiler_secret }}
-{% if enable_elasticsearch | bool %}
-connection_string = elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch_port }}
-{% endif %}
+connection_string = {{ osprofiler_backend_connection_string }}
 {% endif %}
diff --git a/ansible/roles/mistral/templates/mistral.conf.j2 b/ansible/roles/mistral/templates/mistral.conf.j2
index 1c63111f484c23a6722a684f19ac4bfda0603373..2f93b0c486f8d19a6adf7250fc6ed75154e518e7 100644
--- a/ansible/roles/mistral/templates/mistral.conf.j2
+++ b/ansible/roles/mistral/templates/mistral.conf.j2
@@ -67,9 +67,7 @@ policy_file = {{ mistral_policy_file }}
 enabled = true
 trace_sqlalchemy = true
 hmac_keys = {{ osprofiler_secret }}
-{% if enable_elasticsearch | bool %}
-connection_string = elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch_port }}
-{% endif %}
+connection_string = {{ osprofiler_backend_connection_string }}
 {% endif %}
 
 [coordination]
diff --git a/ansible/roles/neutron/templates/neutron.conf.j2 b/ansible/roles/neutron/templates/neutron.conf.j2
index ea4003aea593911eec89e23e98d65c635d1cbf05..b87541dfcc8c2a264661e27c52f8be0cbf01b014 100644
--- a/ansible/roles/neutron/templates/neutron.conf.j2
+++ b/ansible/roles/neutron/templates/neutron.conf.j2
@@ -152,9 +152,7 @@ ipv6_ptr_zone_prefix_size = 116
 enabled = true
 trace_sqlalchemy = true
 hmac_keys = {{ osprofiler_secret }}
-{% if enable_elasticsearch | bool %}
-connection_string = elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch_port }}
-{% endif %}
+connection_string = {{ osprofiler_backend_connection_string }}
 {% endif %}
 
 {% if enable_opendaylight_qos | bool %}
diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2
index e3c4a760057c1374e674e65bc5826cfe4644b922..da6ff2f3c962c8435754208b2574f810bcf46eab 100644
--- a/ansible/roles/nova/templates/nova.conf.j2
+++ b/ansible/roles/nova/templates/nova.conf.j2
@@ -277,9 +277,7 @@ notify_on_state_change = vm_and_task_state
 enabled = true
 trace_sqlalchemy = true
 hmac_keys = {{ osprofiler_secret }}
-{% if enable_elasticsearch | bool %}
-connection_string = elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch_port }}
-{% endif %}
+connection_string = {{ osprofiler_backend_connection_string }}
 {% endif %}
 
 {% if enable_barbican | bool %}
diff --git a/ansible/roles/searchlight/templates/searchlight.conf.j2 b/ansible/roles/searchlight/templates/searchlight.conf.j2
index a0bb7a6d53f4e87ea8653d0c992097aad1299bb6..b42f8fc66bbde2c214356171ceacff097d498140 100644
--- a/ansible/roles/searchlight/templates/searchlight.conf.j2
+++ b/ansible/roles/searchlight/templates/searchlight.conf.j2
@@ -129,7 +129,5 @@ notifications_topics_exchanges = ironic_versioned_notifications,ironic
 {# enabled = true #}
 {# trace_sqlalchemy = true #}
 {# hmac_keys = {{ osprofiler_secret }} #}
-{# {% if enable_elasticsearch | bool %} #}
-{# connection_string = elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch_port }} #}
-{# {% endif %} #}
+{# connection_string = {{ osprofiler_backend_connection_string }} #}
 {# {% endif %} #}
diff --git a/ansible/roles/senlin/templates/senlin.conf.j2 b/ansible/roles/senlin/templates/senlin.conf.j2
index f2135be25f53b545e15141d1aa4e9dd64fb7a5b5..1dd13e4ef4c8cacabd00d6f15a907edb22b90ae6 100644
--- a/ansible/roles/senlin/templates/senlin.conf.j2
+++ b/ansible/roles/senlin/templates/senlin.conf.j2
@@ -62,7 +62,5 @@ policy_file = {{ senlin_policy_file }}
 enabled = true
 trace_sqlalchemy = true
 hmac_keys = {{ osprofiler_secret }}
-{% if enable_elasticsearch | bool %}
-connection_string = elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch_port }}
-{% endif %}
+connection_string = {{ osprofiler_backend_connection_string }}
 {% endif %}
diff --git a/ansible/roles/trove/templates/trove-conductor.conf.j2 b/ansible/roles/trove/templates/trove-conductor.conf.j2
index e9c4bc61cec65e31ef9286afbddb4449b2a309b4..aff9fca256bf7f32cfc3f86f8c39ec36a1ce34ee 100644
--- a/ansible/roles/trove/templates/trove-conductor.conf.j2
+++ b/ansible/roles/trove/templates/trove-conductor.conf.j2
@@ -22,7 +22,5 @@ max_retries = -1
 enabled = true
 trace_sqlalchemy = true
 hmac_keys = {{ osprofiler_secret }}
-{% if enable_elasticsearch | bool %}
-connection_string = elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch_port }}
-{% endif %}
+connection_string = {{ osprofiler_backend_connection_string }}
 {% endif %}
diff --git a/ansible/roles/trove/templates/trove-taskmanager.conf.j2 b/ansible/roles/trove/templates/trove-taskmanager.conf.j2
index 274015390123fd9dbfebbba8bfdad2aaae9c9bce..9a3af2eb8ecfb5ca0c379c1f312ba2f5164c9cf6 100644
--- a/ansible/roles/trove/templates/trove-taskmanager.conf.j2
+++ b/ansible/roles/trove/templates/trove-taskmanager.conf.j2
@@ -48,7 +48,5 @@ driver = noop
 enabled = true
 trace_sqlalchemy = true
 hmac_keys = {{ osprofiler_secret }}
-{% if enable_elasticsearch | bool %}
-connection_string = elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch_port }}
-{% endif %}
+connection_string = {{ osprofiler_backend_connection_string }}
 {% endif %}
diff --git a/ansible/roles/trove/templates/trove.conf.j2 b/ansible/roles/trove/templates/trove.conf.j2
index b966ec9d8e10088822a7cd3704afc436b78f8531..49aec97817b300466a65f623864e0404823d854a 100644
--- a/ansible/roles/trove/templates/trove.conf.j2
+++ b/ansible/roles/trove/templates/trove.conf.j2
@@ -54,7 +54,5 @@ driver = noop
 enabled = true
 trace_sqlalchemy = true
 hmac_keys = {{ osprofiler_secret }}
-{% if enable_elasticsearch | bool %}
-connection_string = elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch_port }}
-{% endif %}
+connection_string = {{ osprofiler_backend_connection_string }}
 {% endif %}
diff --git a/ansible/roles/vitrage/templates/vitrage.conf.j2 b/ansible/roles/vitrage/templates/vitrage.conf.j2
index ff92dbfad4b8ac444e8e46694b58d620731f9a8b..7a4c5d5c3f5076a1c859e7a287d80a8e420ea84d 100644
--- a/ansible/roles/vitrage/templates/vitrage.conf.j2
+++ b/ansible/roles/vitrage/templates/vitrage.conf.j2
@@ -64,7 +64,5 @@ policy_file = {{ vitrage_policy_file }}
 enabled = true
 trace_sqlalchemy = true
 hmac_keys = {{ osprofiler_secret }}
-{% if enable_elasticsearch | bool %}
-connection_string = elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch_port }}
-{% endif %}
+connection_string = {{ osprofiler_backend_connection_string }}
 {% endif %}
diff --git a/ansible/roles/zun/templates/zun.conf.j2 b/ansible/roles/zun/templates/zun.conf.j2
index 627b0e7e237e52b8de678d080c0ed563f1fcc33d..f931f2a3eb9780d8e5b9440f8c03149bf529b2ca 100644
--- a/ansible/roles/zun/templates/zun.conf.j2
+++ b/ansible/roles/zun/templates/zun.conf.j2
@@ -94,9 +94,7 @@ endpoint_type = internalURL
 enabled = true
 trace_sqlalchemy = true
 hmac_keys = {{ osprofiler_secret }}
-{% if enable_elasticsearch | bool %}
-connection_string = elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch_port }}
-{% endif %}
+connection_string = {{ osprofiler_backend_connection_string }}
 {% endif %}
 
 [oslo_concurrency]
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index 75bc08372ff0faf458cc7d601be09b840b50961a..0b296d8e1246f98b47adab9f4781fc85adbba18a 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -162,6 +162,7 @@ kolla_internal_vip_address: "10.10.10.254"
 #enable_congress: "no"
 #enable_designate: "no"
 #enable_destroy_images: "no"
+#enable_elasticsearch: "{{ 'yes' if enable_central_logging | bool or enable_freezer | bool or enable_osprofiler | bool or enable_skydive | bool else 'no' }}"
 #enable_etcd: "no"
 #enable_fluentd: "yes"
 #enable_freezer: "no"
@@ -306,6 +307,11 @@ kolla_internal_vip_address: "10.10.10.254"
 # in glance, so default value should be set to "no".
 glance_enable_rolling_upgrade: "no"
 
+####################
+# Osprofiler options
+####################
+# valid values: ["elasticsearch", "redis"]
+#osprofiler_backend: "elasticsearch"
 
 ##################
 # Barbican options