aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2016-03-04 15:20:49 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-03-04 15:20:49 +0000
commit3b70767b85152cc79381104ba73c0afe9607f781 (patch)
treee5fa1f859ccc236c54a67f8d3646cd8ee796f67a
parentdef1634a5b8a2c8ca794fa878394234a8ebb3468 (diff)
parentd0a5214093293a2295038b0810fe776723895bc0 (diff)
Merge "Add support for SSL endpoints in Functest"
-rw-r--r--docs/configguide/configguide.rst24
-rw-r--r--testcases/functest_utils.py6
2 files changed, 30 insertions, 0 deletions
diff --git a/docs/configguide/configguide.rst b/docs/configguide/configguide.rst
index 7f4ac86c5..b7a25c7d5 100644
--- a/docs/configguide/configguide.rst
+++ b/docs/configguide/configguide.rst
@@ -231,6 +231,30 @@ If still the OpenStack command does not show anything or complains about
connectivity issues, it could be due to an incorrect url given to the OS_AUTH_URL
environment variable. Check the deployment settings.
+SSL Support
+-----------
+
+If the OpenStack deployment is defined to use HTTPS endpoints, a certificate
+will be needed in the container in order to launch any command.
+
+The OS variable will point to that file. For example::
+
+ echo $OS_CACERT
+ /etc/ssl/certs/ca.crt
+
+However, this certificate does not exist in the container by default. It has to
+be copied manually from the OpenStack deployment. This can be done in 2 ways:
+
+ #. Create manually that file and copy the contents from the OpenStack controller.
+
+ #. (recommended) Add the file using a Docker volume when starting the container::
+
+ -v <path_to_your_cert_file>:/etc/ssl/certs/ca.cert
+
+
+
+
+
Additional Options
------------------
diff --git a/testcases/functest_utils.py b/testcases/functest_utils.py
index 7849782c1..f7b832796 100644
--- a/testcases/functest_utils.py
+++ b/testcases/functest_utils.py
@@ -67,6 +67,12 @@ def get_credentials(service):
"http://192.168.20.71:5000/v2.0"),
tenant: os.environ.get("OS_TENANT_NAME", "admin"),
})
+ ssl = os.environ.get("OS_CACERT")
+ if ssl != None:
+ creds.update({"ca_cert":ssl})
+ if not os.path.isfile(ssl):
+ print "WARNING: The 'OS_CACERT' environment variable is set to %s "\
+ "but the file does not exist." % ssl
return creds