openstack
/
sahara
Code Issues Proposed changes

Merge "Enable anti_affinity feature in scenario test"

This commit is contained in:
Jenkins 2015-10-21 13:53:51 +00:00 committed by Gerrit Code Review
parent 4deb141e0e 6292b2a07f
commit 7f1a0df574
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sahara/tests/scenario/README.rst
View File

@ -275,19 +275,19 @@ Section "cluster_template"
This section is dictionary-type.
+----------------------+---------+----------+-----------+---------------------------------------+
| Fields | Type | Required | Default | Value |
+======================+=========+==========+===========+=======================================+
| name | string | True | | name for cluster template |
+----------------------+---------+----------+-----------+---------------------------------------+
| description | string | | Empty | description |
+----------------------+---------+----------+-----------+---------------------------------------+
| cluster_configs | object | | | name_of_config_section: config: value |
+----------------------+---------+----------+-----------+---------------------------------------+
| node_group_templates | object | True | | name_of_node_group: count |
+----------------------+---------+----------+-----------+---------------------------------------+
| anti_affinity | boolean | | False | |
+----------------------+---------+----------+-----------+---------------------------------------+
+----------------------+--------+----------+-----------+---------------------------------------+
| Fields | Type | Required | Default | Value |
+======================+========+==========+===========+=======================================+
| name | string | True | | name for cluster template |
+----------------------+--------+----------+-----------+---------------------------------------+
| description | string | | Empty | description |
+----------------------+--------+----------+-----------+---------------------------------------+
| cluster_configs | object | | | name_of_config_section: config: value |
+----------------------+--------+----------+-----------+---------------------------------------+
| node_group_templates | object | True | | name_of_node_group: count |
+----------------------+--------+----------+-----------+---------------------------------------+
| anti_affinity | array | | Empty | array of roles |
+----------------------+--------+----------+-----------+---------------------------------------+
Section "cluster"

6
sahara/tests/scenario/validation.py
View File

@ -231,7 +231,11 @@ SCHEMA = {
}
},
"anti_affinity": {
"type": "boolean"
"type": "array",
"items": {
"type": "string",
"minLength": 1
}
}
},
"required": ["name", "node_group_templates"],

3
sahara/tests/scenario_unit/vanilla2_7_1.yaml
View File

@ -41,6 +41,9 @@ clusters:
node_group_templates:
master: 1
worker: 3
anti_affinity:
- namenode
- datanode
scenario:
- run_jobs
- scale