summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-07-12 20:15:50 +0000
committerGerrit Code Review <review@openstack.org>2014-07-12 20:15:50 +0000
commitbd545bd1ad7fcd6ac8252f6b83835afd9128b657 (patch)
treec8a006df1827d33140cbd1aee7290631536c49e1
parent6f8eb474f8477bfd5b5448d64cfde21d94bd6dc9 (diff)
parent680b68a736c507681cd7c63a20f77838110c414a (diff)
downloadpython-saharaclient-bd545bd1ad7fcd6ac8252f6b83835afd9128b657.tar.gz
Merge "Make Cluster Template accept default_image_id field"
-rw-r--r--saharaclient/api/cluster_templates.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/saharaclient/api/cluster_templates.py b/saharaclient/api/cluster_templates.py
index f9ca583..7bb3f61 100644
--- a/saharaclient/api/cluster_templates.py
+++ b/saharaclient/api/cluster_templates.py
@@ -25,7 +25,7 @@ class ClusterTemplateManager(base.ResourceManager):
def _assign_field(self, name, plugin_name, hadoop_version,
description=None, cluster_configs=None, node_groups=None,
- anti_affinity=None, net_id=None):
+ anti_affinity=None, net_id=None, default_image_id=None):
data = {
'name': name,
'plugin_name': plugin_name,
@@ -37,24 +37,25 @@ class ClusterTemplateManager(base.ResourceManager):
cluster_configs=cluster_configs,
node_groups=node_groups,
anti_affinity=anti_affinity,
- neutron_management_network=net_id)
+ neutron_management_network=net_id,
+ default_image_id=default_image_id)
return data
def create(self, name, plugin_name, hadoop_version, description=None,
cluster_configs=None, node_groups=None, anti_affinity=None,
- net_id=None):
+ net_id=None, default_image_id=None):
data = self._assign_field(name, plugin_name, hadoop_version,
description, cluster_configs, node_groups,
- anti_affinity, net_id)
+ anti_affinity, net_id, default_image_id)
return self._create('/cluster-templates', data, 'cluster_template')
def update(self, cluster_template_id, name, plugin_name, hadoop_version,
description=None, cluster_configs=None, node_groups=None,
- anti_affinity=None, net_id=None):
+ anti_affinity=None, net_id=None, default_image_id=None):
data = self._assign_field(name, plugin_name, hadoop_version,
description, cluster_configs, node_groups,
- anti_affinity, net_id)
+ anti_affinity, net_id, default_image_id)
return self._update('/cluster-templates/%s' % cluster_template_id,
data, 'cluster_template')