diff --git a/deploy-guide/source/app-config-test.rst b/deploy-guide/source/app-config-test.rst
index e9ff5a3e43..09b55454db 100644
--- a/deploy-guide/source/app-config-test.rst
+++ b/deploy-guide/source/app-config-test.rst
@@ -101,8 +101,12 @@ User variables
 --------------
 
 The ``/etc/openstack_deploy/user_variables.yml`` file defines the global
-overrides for the default variables
+overrides for the default variables.
+
+For this environment, you are using the same IP address for the internal
+and external endpoints. You will need to ensure that the internal and public
+OpenStack endpoints are served with the same protocol. This is done with
+the following content:
+
+.. literalinclude:: ../../etc/openstack_deploy/user_variables.yml.test.example
 
-For this environment you do not need the
-``/etc/openstack_deploy/user_variables.yml`` file as the defaults set by
-OpenStack-Ansible are suitable.
diff --git a/etc/openstack_deploy/openstack_user_config.yml.prod.example b/etc/openstack_deploy/openstack_user_config.yml.prod.example
index 1de7199634..7917c20eeb 100644
--- a/etc/openstack_deploy/openstack_user_config.yml.prod.example
+++ b/etc/openstack_deploy/openstack_user_config.yml.prod.example
@@ -12,6 +12,12 @@ used_ips:
 
 global_overrides:
   internal_lb_vip_address: 172.29.236.9
+  #
+  # The below domain name must resolve to an IP address
+  # in the CIDR specified in haproxy_keepalived_external_vip_cidr.
+  # If using different protocols (https/http) for the public/internal
+  # endpoints the two addresses must be different.
+  #
   external_lb_vip_address: openstack.example.com
   tunnel_bridge: "br-vxlan"
   management_bridge: "br-mgmt"
diff --git a/etc/openstack_deploy/openstack_user_config.yml.test.example b/etc/openstack_deploy/openstack_user_config.yml.test.example
index ce002da111..3a1be73cb4 100644
--- a/etc/openstack_deploy/openstack_user_config.yml.test.example
+++ b/etc/openstack_deploy/openstack_user_config.yml.test.example
@@ -12,7 +12,7 @@ used_ips:
 
 global_overrides:
   internal_lb_vip_address: 172.29.236.11
-  external_lb_vip_address: openstack.example.com
+  external_lb_vip_address: 172.29.236.11
   tunnel_bridge: "br-vxlan"
   management_bridge: "br-mgmt"
   provider_networks:
diff --git a/etc/openstack_deploy/user_variables.yml.test.example b/etc/openstack_deploy/user_variables.yml.test.example
new file mode 100644
index 0000000000..3ca60bc1e3
--- /dev/null
+++ b/etc/openstack_deploy/user_variables.yml.test.example
@@ -0,0 +1,6 @@
+---
+# This file contains an example of the global variable overrides
+# which may need to be set for a production environment.
+
+## OpenStack public endpoint protocol
+openstack_service_publicuri_proto: http