Merge "Support running on openstack which enabled https"

author Jose Lausuch <jose.lausuch@ericsson.com>

Thu, 23 Mar 2017 09:08:11 +0000 (09:08 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Thu, 23 Mar 2017 09:08:11 +0000 (09:08 +0000)
author Jose Lausuch <jose.lausuch@ericsson.com>
Thu, 23 Mar 2017 09:08:11 +0000 (09:08 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Thu, 23 Mar 2017 09:08:11 +0000 (09:08 +0000)
diff --cc functest/utils/openstack_utils.py

index e33af63,ffc870f..ffc870f

mode 100644,100755..100644
--- 1/functest/utils/openstack_utils.py
--- 2/functest/utils/openstack_utils.py
+++ b/functest/utils/openstack_utils.py
author	Jose Lausuch <jose.lausuch@ericsson.com>
	Thu, 23 Mar 2017 09:08:11 +0000 (09:08 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Thu, 23 Mar 2017 09:08:11 +0000 (09:08 +0000)