diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-16 12:11:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-16 12:11:31 +0000 |
| commit | 7fa1eadabad37510a7eb6fcc28b019ee9f157341 (patch) | |
| tree | e69abf692805fd485ab6b504d5d33aa42abc4c6a | |
| parent | e9f953fc846dbbd05f81a227f3d87c0028fb2d85 (diff) | |
| parent | b43dc219b14daf64b4b0c35d9428b89fb9beda4d (diff) | |
| download | python-saharaclient-7fa1eadabad37510a7eb6fcc28b019ee9f157341.tar.gz | |
Merge "Support Cinder availability zones"
| -rw-r--r-- | doc/source/api.rst | 2 | ||||
| -rw-r--r-- | saharaclient/api/node_group_templates.py | 36 |
2 files changed, 21 insertions, 17 deletions
diff --git a/doc/source/api.rst b/doc/source/api.rst index 55b2585..4686c64 100644 --- a/doc/source/api.rst +++ b/doc/source/api.rst @@ -133,7 +133,7 @@ Image Registry ops Node Group Template ops ~~~~~~~~~~~~~~~~~~~~~~~ - * create(name, plugin_name, hadoop_version, flavor_id, description, volumes_per_node, volumes_size, node_processes, node_configs, floating_ip_pool, availability_zone) - Create a Node Group Template with specified parameters. + * create(name, plugin_name, hadoop_version, flavor_id, description, volumes_per_node, volumes_size, node_processes, node_configs, floating_ip_pool, availability_zone, volumes_availability_zone) - Create a Node Group Template with specified parameters. Cluster Template ops ~~~~~~~~~~~~~~~~~~~~ diff --git a/saharaclient/api/node_group_templates.py b/saharaclient/api/node_group_templates.py index ba4ec05..66df86d 100644 --- a/saharaclient/api/node_group_templates.py +++ b/saharaclient/api/node_group_templates.py @@ -24,11 +24,11 @@ class NodeGroupTemplateManager(base.ResourceManager): resource_class = NodeGroupTemplate def _assign_field(self, name, plugin_name, hadoop_version, flavor_id, - description=None, - volumes_per_node=None, volumes_size=None, - node_processes=None, node_configs=None, - floating_ip_pool=None, security_groups=None, - auto_security_group=None, availability_zone=None): + description=None, volumes_per_node=None, + volumes_size=None, node_processes=None, + node_configs=None, floating_ip_pool=None, + security_groups=None, auto_security_group=None, + availability_zone=None, volumes_availability_zone=None): data = { 'name': name, @@ -50,6 +50,9 @@ class NodeGroupTemplateManager(base.ResourceManager): if volumes_per_node: data.update({"volumes_per_node": volumes_per_node, "volumes_size": volumes_size}) + if volumes_availability_zone: + data.update({"volumes_availability_zone": + volumes_availability_zone}) return data @@ -57,30 +60,31 @@ class NodeGroupTemplateManager(base.ResourceManager): description=None, volumes_per_node=None, volumes_size=None, node_processes=None, node_configs=None, floating_ip_pool=None, security_groups=None, auto_security_group=None, - availability_zone=None): + availability_zone=None, volumes_availability_zone=None): data = self._assign_field(name, plugin_name, hadoop_version, flavor_id, description, volumes_per_node, volumes_size, node_processes, node_configs, floating_ip_pool, security_groups, - auto_security_group, availability_zone) + auto_security_group, availability_zone, + volumes_availability_zone) return self._create('/node-group-templates', data, 'node_group_template') def update(self, ng_template_id, name, plugin_name, hadoop_version, flavor_id, description=None, volumes_per_node=None, - volumes_size=None, node_processes=None, - node_configs=None, floating_ip_pool=None, - security_groups=None, auto_security_group=None, - availability_zone=None): + volumes_size=None, node_processes=None, node_configs=None, + floating_ip_pool=None, security_groups=None, + auto_security_group=None, availability_zone=None, + volumes_availability_zone=None): data = self._assign_field(name, plugin_name, hadoop_version, flavor_id, - description, volumes_per_node, - volumes_size, node_processes, - node_configs, floating_ip_pool, - security_groups, auto_security_group, - availability_zone) + description, volumes_per_node, volumes_size, + node_processes, node_configs, + floating_ip_pool, security_groups, + auto_security_group, availability_zone, + volumes_availability_zone) return self._update('/node-group-templates/%s' % ng_template_id, data, 'node_group_template') |