Merge "cluster-create support volume_type"
This commit is contained in:
commit
87dcd78053
@ -156,6 +156,7 @@ class CassandraCluster(models.Cluster):
|
||||
availability_zone=instance_az,
|
||||
configuration_id=configuration_id,
|
||||
cluster_config=member_config,
|
||||
volume_type=instance.get('volume_type', None),
|
||||
modules=instance.get('modules'),
|
||||
locality=locality,
|
||||
region_name=instance.get('region_name'))
|
||||
|
@ -121,6 +121,8 @@ class GaleraCommonCluster(cluster_models.Cluster):
|
||||
nics=instance.get('nics', None),
|
||||
configuration_id=configuration_id,
|
||||
cluster_config=member_config,
|
||||
volume_type=instance.get(
|
||||
'volume_type', None),
|
||||
modules=instance.get('modules'),
|
||||
locality=locality,
|
||||
region_name=instance.get('region_name')
|
||||
|
@ -90,6 +90,7 @@ class MongoDbCluster(models.Cluster):
|
||||
|
||||
flavor_id = instances[0]['flavor_id']
|
||||
volume_size = instances[0].get('volume_size', None)
|
||||
volume_type = instances[0].get('volume_type', None)
|
||||
|
||||
nics = [instance.get('nics', None) for instance in instances]
|
||||
|
||||
@ -135,6 +136,7 @@ class MongoDbCluster(models.Cluster):
|
||||
nics=nics[i],
|
||||
configuration_id=None,
|
||||
cluster_config=member_config,
|
||||
volume_type=volume_type,
|
||||
modules=instances[i].get('modules'),
|
||||
locality=locality,
|
||||
region_name=regions[i])
|
||||
@ -151,8 +153,10 @@ class MongoDbCluster(models.Cluster):
|
||||
nics=None,
|
||||
configuration_id=None,
|
||||
cluster_config=configsvr_config,
|
||||
volume_type=volume_type,
|
||||
locality=locality,
|
||||
region_name=regions[i % num_instances])
|
||||
region_name=regions[i % num_instances]
|
||||
)
|
||||
|
||||
for i in range(1, num_mongos + 1):
|
||||
instance_name = "%s-%s-%s" % (name, "mongos", str(i))
|
||||
@ -166,8 +170,10 @@ class MongoDbCluster(models.Cluster):
|
||||
nics=None,
|
||||
configuration_id=None,
|
||||
cluster_config=mongos_config,
|
||||
volume_type=volume_type,
|
||||
locality=locality,
|
||||
region_name=regions[i % num_instances])
|
||||
region_name=regions[i % num_instances]
|
||||
)
|
||||
|
||||
task_api.load(context, datastore_version.manager).create_cluster(
|
||||
db_info.id)
|
||||
|
@ -88,6 +88,8 @@ class RedisCluster(models.Cluster):
|
||||
cluster_config={
|
||||
"id": db_info.id,
|
||||
"instance_type": "member"},
|
||||
volume_type=instance.get(
|
||||
'volume_type', None),
|
||||
modules=instance.get('modules'),
|
||||
locality=locality,
|
||||
region_name=instance.get(
|
||||
|
@ -98,6 +98,7 @@ class VerticaCluster(models.Cluster):
|
||||
|
||||
flavor_id = instances[0]['flavor_id']
|
||||
volume_size = instances[0].get('volume_size', None)
|
||||
volume_type = instances[0].get('volume_type', None)
|
||||
|
||||
nics = [instance.get('nics', None) for instance in instances]
|
||||
|
||||
@ -123,6 +124,7 @@ class VerticaCluster(models.Cluster):
|
||||
datastore_version, volume_size, None,
|
||||
nics=nics[i], availability_zone=azs[i],
|
||||
configuration_id=None, cluster_config=member_config,
|
||||
volume_type=volume_type,
|
||||
modules=instances[i].get('modules'), locality=locality,
|
||||
region_name=regions[i])
|
||||
)
|
||||
|
Loading…
x
Reference in New Issue
Block a user