Merge "Make Cluster Template accept default_image_id field"

This commit is contained in:
Jenkins
2014-07-12 20:15:50 +00:00
committed by Gerrit Code Review

View File

@@ -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')