openstack
/
magnum
Code Issues Proposed changes

Update documentation with bay/cluster version info 

Change-Id: Ie09f504648d0b5b82bc2e8ea8075f83df5744e6e
Closes-Bug: #1613413
This commit is contained in:
Vijendar Komalla 2016-09-01 15:50:25 -05:00
parent 849c856386
commit 62530c2001
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/source/dev/quickstart.rst
View File

@ -436,11 +436,13 @@ redis-master is running::
| updated_at | 2016-05-26T17:50:02+00:00 |
| create_timeout | 60 |
| api_address | https://172.24.4.4:6443 |
| coe_version | v1.2.0 |
| cluster_template_id| e73298e7-e621-4d42-b35b-7a1952b97158 |
| master_addresses | ['172.24.4.6'] |
| node_count | 1 |
| node_addresses | ['172.24.4.5'] |
| master_count | 1 |
| container_version | 1.9.1 |
| discovery_url | https://discovery.etcd.io/4caaa65f297d4d49ef0a085a7aecf8e0 |
| name | k8s-cluster |
+--------------------+------------------------------------------------------------+
@ -530,11 +532,13 @@ Now that we have a swarm cluster we can start interacting with it::
| updated_at | 2015-04-20T19:06:08+00:00 |
| create_timeout | 60 |
| api_address | https://172.24.4.4:6443 |
| coe_version | 1.0.0 |
| cluster_template_id| e73298e7-e621-4d42-b35b-7a1952b97158 |
| master_addresses | ['172.24.4.6'] |
| node_count | 2 |
| node_addresses | ['172.24.4.5'] |
| master_count | 1 |
| container_version | 1.9.1 |
| discovery_url | https://discovery.etcd.io/4caaa65f297d4d49ef0a085a7aecf8e0 |
| name | swarm-cluster |
+--------------------+------------------------------------------------------------+
@ -654,11 +658,13 @@ need to make sure the cluster's status is 'CREATE_COMPLETE'::
| updated_at | 2015-06-09T20:28:18+00:00 |
| create_timeout | 60 |
| api_address | https://172.24.4.115:6443 |
| coe_version | - |
| cluster_template_id| 92dbda62-32d4-4435-88fc-8f42d514b347 |
| master_addresses | ['172.24.4.115'] |
| node_count | 2 |
| node_addresses | ['172.24.4.116', '172.24.4.117'] |
| master_count | 1 |
| container_version | 1.9.1 |
| discovery_url | None |
| name | mesos-cluster |
+--------------------+------------------------------------------------------------+

4
doc/source/userguide.rst
View File

@ -1421,11 +1421,13 @@ creation::
| updated_at | None |
| create_timeout | 0 |
| api_address | None |
| coe_version | - |
| cluster_template_id| 5519b24a-621c-413c-832f-c30424528b31 |
| master_addresses | None |
| node_count | 1 |
| node_addresses | None |
| master_count | 1 |
| container_version | - |
| discovery_url | https://discovery.etcd.io/ba52a8178e7364d43a323ee4387cf28e |
| name | secure-k8s-cluster |
+--------------------+------------------------------------------------------------+
@ -1445,12 +1447,14 @@ the api_address is 'https'::
| created_at | 2016-07-25T23:14:06+00:00 |
| updated_at | 2016-07-25T23:14:10+00:00 |
| create_timeout | 60 |
| coe_version | v1.2.0 |
| api_address | https://192.168.19.86:6443 |
| cluster_template_id| da2825a0-6d09-4208-b39e-b2db666f1118 |
| master_addresses | ['192.168.19.87'] |
| node_count | 1 |
| node_addresses | ['192.168.19.88'] |
| master_count | 1 |
| container_version | 1.9.1 |
| discovery_url | https://discovery.etcd.io/3b7fb09733429d16679484673ba3bfd5 |
| name | secure-k8s-cluster |
+--------------------+------------------------------------------------------------+

2
magnum/drivers/k8s_coreos_v1/version.py
View File

@ -14,4 +14,4 @@
version = '1.0.0'
driver = 'k8s_coreos'
container_version = '1.9.0'
container_version = '1.11.2'