commit 5d29b2cd267142b5c396fdef689b55589c80a857
author JordanP <jordan.pittier-ext@cloudwatt.com> Wed Dec 18 13:56:03 2013 +0000
committer JordanP <jordan.pittier@cloudwatt.com> Tue Feb 18 09:51:03 2014 +0000
tree e280930ec07b7a3726a6b4467144f2774166b717
parent 6d6c7af3b4ef88e4481c3ddbd838e615b3f709ce

Make endpoint type configurable

Allow to specify the endpoint type to use for each service. Not everybody will
want to use publicURL, so let's make this configurable.

Closes-Bug: #1178083
Change-Id: Idb414aef7510178efef59cb48149ff1d86f11cb1

etc/tempest.conf.sample

diff --git a/etc/tempest.conf.sample b/etc/tempest.conf.sample
index 025d0f3..b779068 100644
--- a/etc/tempest.conf.sample
+++ b/etc/tempest.conf.sample
@@ -261,6 +261,10 @@
 # value)
 #region=
 
+# The endpoint type to use for the compute service. (string
+# value)
+#endpoint_type=publicURL
+
 # Catalog type of the Compute v3 service. (string value)
 #catalog_v3_type=computev3
 
@@ -407,6 +411,10 @@
 # one is used. (string value)
 #region=RegionOne
 
+# The endpoint type to use for the identity service. (string
+# value)
+#endpoint_type=publicURL
+
 # Username to use for Nova API requests. (string value)
 #username=demo
 
@@ -475,6 +483,10 @@
 # value)
 #region=
 
+# The endpoint type to use for the image service. (string
+# value)
+#endpoint_type=publicURL
+
 # http accessible image (string value)
 #http_image=http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-uec.tar.gz
 
@@ -530,6 +542,10 @@
 # value)
 #region=
 
+# The endpoint type to use for the network service. (string
+# value)
+#endpoint_type=publicURL
+
 # The cidr block to allocate tenant ipv4 subnets from (string
 # value)
 #tenant_network_cidr=10.100.0.0/16
@@ -591,6 +607,10 @@
 # (string value)
 #region=
 
+# The endpoint type to use for the object-store service.
+# (string value)
+#endpoint_type=publicURL
+
 # Number of seconds to time on waiting for a container to
 # container synchronization complete. (integer value)
 #container_sync_timeout=120
@@ -631,6 +651,10 @@
 # value)
 #region=
 
+# The endpoint type to use for the orchestration service.
+# (string value)
+#endpoint_type=publicURL
+
 # Time in seconds between build status checks. (integer value)
 #build_interval=1
 
@@ -804,6 +828,10 @@
 # value)
 #region=
 
+# The endpoint type to use for the volume service. (string
+# value)
+#endpoint_type=publicURL
+
 # Name of the backend1 (must be declared in cinder.conf)
 # (string value)
 #backend1_name=BACKEND_1