summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-09-30 16:34:32 +0000
committerGerrit Code Review <review@openstack.org>2013-09-30 16:34:32 +0000
commit41c5ddb7de8c2f4f82dc959d7cd4e1e1f14e6754 (patch)
tree0d0837d0654e26db73b39684316f47b00ade3834
parentac25b6d2211b946bbdae68df32fb0f0d2bb9f3a9 (diff)
parent6562cf8ffdeb193d2ca6739d4a9bc3e9d044858d (diff)
downloadpython-saharaclient-41c5ddb7de8c2f4f82dc959d7cd4e1e1f14e6754.tar.gz
Merge "Fix Node Groups handling on creation"
-rw-r--r--savannaclient/api/cluster_templates.py2
-rw-r--r--savannaclient/api/clusters.py3
2 files changed, 1 insertions, 4 deletions
diff --git a/savannaclient/api/cluster_templates.py b/savannaclient/api/cluster_templates.py
index c18de32..dcf73b0 100644
--- a/savannaclient/api/cluster_templates.py
+++ b/savannaclient/api/cluster_templates.py
@@ -33,7 +33,7 @@ class ClusterTemplateManager(base.ResourceManager):
'hadoop_version': hadoop_version,
'description': description,
'cluster_configs': cluster_configs,
- 'node_groups': [ng.as_dict() for ng in node_groups],
+ 'node_groups': node_groups,
'anti_affinity': anti_affinity
}
diff --git a/savannaclient/api/clusters.py b/savannaclient/api/clusters.py
index 0245560..564dc69 100644
--- a/savannaclient/api/clusters.py
+++ b/savannaclient/api/clusters.py
@@ -41,9 +41,6 @@ class ClusterManager(base.ResourceManager):
description=None, cluster_configs=None, node_groups=None,
user_keypair_id=None, anti_affinity=None, net_id=None):
- if node_groups is not None:
- node_groups = [ng.as_dict() for ng in node_groups]
-
data = {
'name': name,
'plugin_name': plugin_name,