summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-01 20:37:28 +0000
committerGerrit Code Review <review@openstack.org>2015-11-01 20:37:28 +0000
commit28d7d601038a9ed64636d249b753b3b1df704e25 (patch)
treeb57133285b4972fcf4fadef170bee328c6980e28
parent11299a06e611b11623b801dd6e24dab82d4b3a4e (diff)
parentc71ba514a3827f09312e873899a39d4974bd1e4c (diff)
downloados-client-config-28d7d601038a9ed64636d249b753b3b1df704e25.tar.gz
Merge "Add conoha public cloud"
-rw-r--r--doc/source/vendor-support.rst15
-rw-r--r--os_client_config/vendors/conoha.yaml8
2 files changed, 23 insertions, 0 deletions
diff --git a/doc/source/vendor-support.rst b/doc/source/vendor-support.rst
index 5519928..2199531 100644
--- a/doc/source/vendor-support.rst
+++ b/doc/source/vendor-support.rst
@@ -264,3 +264,18 @@ ZH Zurich, CH
* Images must be in `raw` format
* Images must be uploaded using the Glance Task Interface
+
+conoha
+------
+
+https://identity.%(region_name)s.conoha.io/v2.0
+
+============== ================
+Region Name Human Name
+============== ================
+tyo1 Tokyo, JP
+sin1 Singapore
+lon1 London, UK
+============== ================
+
+* Images cannot be uploaded
diff --git a/os_client_config/vendors/conoha.yaml b/os_client_config/vendors/conoha.yaml
new file mode 100644
index 0000000..1ed4063
--- /dev/null
+++ b/os_client_config/vendors/conoha.yaml
@@ -0,0 +1,8 @@
+name: conoha
+profile:
+ auth:
+ auth_url: https://identity.{region_name}.conoha.io/v2.0
+ regions:
+ - sin1
+ - lon1
+ - tyo1