Merge "Added support of is_proxy_gateway field for node group"

This commit is contained in:
Jenkins
2015-02-06 11:03:21 +00:00
committed by Gerrit Code Review

View File

@@ -29,7 +29,7 @@ class NodeGroupTemplateManager(base.ResourceManager):
node_configs=None, floating_ip_pool=None,
security_groups=None, auto_security_group=None,
availability_zone=None, volumes_availability_zone=None,
volume_type=None, image_id=None):
volume_type=None, image_id=None, is_proxy_gateway=None):
data = {
'name': name,
@@ -46,7 +46,8 @@ class NodeGroupTemplateManager(base.ResourceManager):
security_groups=security_groups,
auto_security_group=auto_security_group,
availability_zone=availability_zone,
image_id=image_id
image_id=image_id,
is_proxy_gateway=is_proxy_gateway
)
if volumes_per_node:
@@ -65,7 +66,7 @@ class NodeGroupTemplateManager(base.ResourceManager):
node_processes=None, node_configs=None, floating_ip_pool=None,
security_groups=None, auto_security_group=None,
availability_zone=None, volumes_availability_zone=None,
volume_type=None, image_id=None):
volume_type=None, image_id=None, is_proxy_gateway=None):
data = self._assign_field(name, plugin_name, hadoop_version, flavor_id,
description, volumes_per_node, volumes_size,
@@ -73,7 +74,7 @@ class NodeGroupTemplateManager(base.ResourceManager):
floating_ip_pool, security_groups,
auto_security_group, availability_zone,
volumes_availability_zone, volume_type,
image_id)
image_id, is_proxy_gateway)
return self._create('/node-group-templates', data,
'node_group_template')
@@ -84,7 +85,7 @@ class NodeGroupTemplateManager(base.ResourceManager):
floating_ip_pool=None, security_groups=None,
auto_security_group=None, availability_zone=None,
volumes_availability_zone=None, volume_type=None,
image_id=None):
image_id=None, is_proxy_gateway=None):
data = self._assign_field(name, plugin_name, hadoop_version, flavor_id,
description, volumes_per_node, volumes_size,
@@ -92,7 +93,7 @@ class NodeGroupTemplateManager(base.ResourceManager):
floating_ip_pool, security_groups,
auto_security_group, availability_zone,
volumes_availability_zone, volume_type,
image_id)
image_id, is_proxy_gateway)
return self._update('/node-group-templates/%s' % ng_template_id, data,
'node_group_template')