diff --git a/playbooks/roles/os_keystone/defaults/main.yml b/playbooks/roles/os_keystone/defaults/main.yml
index 187e19f94c..29972c9e10 100644
--- a/playbooks/roles/os_keystone/defaults/main.yml
+++ b/playbooks/roles/os_keystone/defaults/main.yml
@@ -80,6 +80,9 @@ keystone_service_internalurl_v3: "{{ keystone_service_internaluri_v3 }}/v3"
 keystone_service_adminuri_v3: "{{ keystone_service_proto }}://{{ internal_lb_vip_address }}:{{ keystone_admin_port }}"
 keystone_service_adminurl_v3: "{{ keystone_service_adminuri_v3 }}/v3"
 
+## Set this value to override the "public_endpoint" keystone.conf variable
+#keystone_public_endpoint:
+
 ## Apache setup
 keystone_apache_log_level: info
 
diff --git a/playbooks/roles/os_keystone/templates/keystone.conf.j2 b/playbooks/roles/os_keystone/templates/keystone.conf.j2
index 78d79da9a3..906affde07 100644
--- a/playbooks/roles/os_keystone/templates/keystone.conf.j2
+++ b/playbooks/roles/os_keystone/templates/keystone.conf.j2
@@ -6,7 +6,9 @@ debug = {{ debug }}
 admin_token = {{ keystone_auth_admin_token }}
 bind_host = {{ keystone_bind_address }}
 public_port = {{ keystone_service_port }}
-public_endpoint = {{ keystone_service_publicuri }}
+{% if keystone_public_endpoint is defined %}
+public_endpoint = {{ keystone_public_endpoint }}
+{% endif %}
 admin_port = {{ keystone_admin_port }}
 admin_endpoint = {{ keystone_service_adminuri }}