openstack/trove
Code Issues Proposed changes

Merge "Add support for nic and az in cluster grow"

Browse Source
This commit is contained in:
Jenkins 2016-12-18 03:30:29 +00:00 committed by Gerrit Code Review
commit 31e0d00b2a
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
releasenotes/notes/grow-cluster-nic-az-0e0fe4083666c300.yaml Normal file
View File

@ -0,0 +1,4 @@
---
fixes:
- Pass instance nic and az to cluster grow. Add specific
Fix for mongodb to use the instance nic and az.

5
trove/cluster/models.py
View File

@ -298,6 +298,11 @@ class Cluster(object):
instance['volume_size'] = int(node['volume']['size'])
if 'modules' in node:
instance['modules'] = node['modules']
if 'nics' in node:
instance['nics'] = node['nics']
if 'availability_zone' in node:
instance['availability_zone'] = (
node['availability_zone'])
instances.append(instance)
return self.grow(instances)
elif action == 'shrink':

6
trove/common/strategies/cluster/experimental/mongodb/api.py
View File

@ -199,6 +199,8 @@ class MongoDbCluster(models.Cluster):
'query_router'])
name = _check_option('name')
related_to = _check_option('related_to')
nics = _check_option('nics')
availability_zone = _check_option('availability_zone')
unused_keys = list(set(item.keys()).difference(set(used_keys)))
if unused_keys:
@ -214,6 +216,10 @@ class MongoDbCluster(models.Cluster):
instance['name'] = name
if related_to:
instance['related_to'] = related_to
if nics:
instance['nics'] = nics
if availability_zone:
instance['availability_zone'] = availability_zone
return instance
def action(self, context, req, action, param):