openstack/deb-sahara
Code Issues Proposed changes

Merge "Docs fix for Neutron and Floating IP supprot"

Browse Source
This commit is contained in:
Jenkins 2013-09-24 04:06:34 +00:00 committed by Gerrit Code Review
commit 9a928730ae
2 changed files with 39 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
doc/source/devref/plugin.spi.rst
View File

@ -242,6 +242,9 @@ Group of instances.
+----------------------+--------+--------------------------------------------------------+
| volumes_mount_prefix | string | Prefix added to mount path of each volume. |
+----------------------+--------+--------------------------------------------------------+
| floatig_ip_pool | string | Floating IP Pool name. All instances in the Node Group |
| | | will have Floating IPs assigned from this pool. |
+----------------------+--------+--------------------------------------------------------+
| count | int | Number of instances in this Node Group. |
+----------------------+--------+--------------------------------------------------------+
| username | string | Username used by Savanna to establish remote |
@ -260,34 +263,37 @@ Contains all relevant info about cluster.
This object is is provided to the plugin for both cluster creation and scaling.
The “Cluster Lifecycle” section below further specifies which fields are filled at which moment.
+----------------------+--------+-----------------------------------------------------------+
| Property | Type | Description |
+======================+========+===========================================================+
| name | string | Cluster name. |
+----------------------+--------+-----------------------------------------------------------+
| tenant_id | string | OpenStack Tenant id where this Cluster is available. |
+----------------------+--------+-----------------------------------------------------------+
| plugin_name | string | Plugin name. |
+----------------------+--------+-----------------------------------------------------------+
| hadoop_version | string | Hadoop version running on instances. |
+----------------------+--------+-----------------------------------------------------------+
| default_image_id | string | OpenStack image used to boot instances. |
+----------------------+--------+-----------------------------------------------------------+
| node_groups | list | List of Node Groups. |
+----------------------+--------+-----------------------------------------------------------+
| cluster_configs | dict | Dictionary of Cluster scoped configurations. |
+----------------------+--------+-----------------------------------------------------------+
| cluster_template_id | string | Cluster Template used for Node Groups and Configurations. |
+----------------------+--------+-----------------------------------------------------------+
| user_keypair_id | string | OpenStack keypair added to instances to make them |
| | | accessible for user. |
+----------------------+--------+-----------------------------------------------------------+
| anti_affinity | list | List of processes that will be run on different hosts. |
+----------------------+--------+-----------------------------------------------------------+
| description | string | Cluster Description. |
+----------------------+--------+-----------------------------------------------------------+
| info | dict | Dictionary for additional information. |
+----------------------+--------+-----------------------------------------------------------+
+----------------------------+--------+-----------------------------------------------------------+
| Property | Type | Description |
+============================+========+===========================================================+
| name | string | Cluster name. |
+----------------------------+--------+-----------------------------------------------------------+
| tenant_id | string | OpenStack Tenant id where this Cluster is available. |
+----------------------------+--------+-----------------------------------------------------------+
| plugin_name | string | Plugin name. |
+----------------------------+--------+-----------------------------------------------------------+
| hadoop_version | string | Hadoop version running on instances. |
+----------------------------+--------+-----------------------------------------------------------+
| default_image_id | string | OpenStack image used to boot instances. |
+----------------------------+--------+-----------------------------------------------------------+
| node_groups | list | List of Node Groups. |
+----------------------------+--------+-----------------------------------------------------------+
| cluster_configs | dict | Dictionary of Cluster scoped configurations. |
+----------------------------+--------+-----------------------------------------------------------+
| cluster_template_id | string | Cluster Template used for Node Groups and Configurations. |
+----------------------------+--------+-----------------------------------------------------------+
| user_keypair_id | string | OpenStack keypair added to instances to make them |
| | | accessible for user. |
+----------------------------+--------+-----------------------------------------------------------+
| neutron_management_network | string | Neutron network ID. Instances will get fixed IPs in this |
| | | network if 'use_neutron' config is set to True. |
+----------------------------+--------+-----------------------------------------------------------+
| anti_affinity | list | List of processes that will be run on different hosts. |
+----------------------------+--------+-----------------------------------------------------------+
| description | string | Cluster Description. |
+----------------------------+--------+-----------------------------------------------------------+
| info | dict | Dictionary for additional information. |
+----------------------------+--------+-----------------------------------------------------------+
Validation Error

5
doc/source/userdoc/rest_api_v1.0.rst
View File

@ -851,6 +851,7 @@ This operation does not require a request body.
],
"flavor_id": "42",
"volumes_per_node": 0,
"floating_ip_pool": "public",
"node_configs": {
"HDFS": {},
"MapReduce": {}
@ -889,6 +890,7 @@ This operation returns created Node Group Template.
"jobtracker"
],
"name": "master",
"floating_ip_pool", "public",
"flavor_id": "42"
}
@ -913,6 +915,7 @@ This operation returns created Node Group Template.
],
"flavor_id": "42",
"volumes_per_node": 0,
"floating_ip_pool", "public",
"node_configs": {},
"hadoop_version": "1.2.1",
"id": "ddefda09-9ab9-4555-bf48-e996243af6f2"
@ -1238,6 +1241,7 @@ This operation returns created Cluster Template.
}
],
"name": "cl-template",
"neutron_management_network": "e017fdde-a2f7-41ed-b342-2d63083e7772",
"cluster_configs": {}
}
@ -1291,6 +1295,7 @@ This operation returns created Cluster Template.
"node_group_template_id": "ea34d320-09d7-4dc1-acbf-75b57cec81c9"
}
],
"neutron_management_network": "e017fdde-a2f7-41ed-b342-2d63083e7772",
"cluster_configs": {},
"hadoop_version": "1.2.1",
"id": "e2ad1d5d-5fff-45e8-8c3c-34697c7cd5ac"