diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-14 11:00:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-14 11:00:21 +0000 |
| commit | dcbfdae7cbd864ed412056812dbf7ee8b7a14674 (patch) | |
| tree | 58d2686663b1170e722287a78fb29906a9a5a628 /trove/cluster | |
| parent | d3137acde46c6e8b6e33c5b71cec318fe77a8818 (diff) | |
| parent | b928ec680a26fc97cac67fdec9deeb5be3e0bc4c (diff) | |
| download | trove-dcbfdae7cbd864ed412056812dbf7ee8b7a14674.tar.gz | |
Merge "Add support for modules in cluster create/grow"
Diffstat (limited to 'trove/cluster')
| -rw-r--r-- | trove/cluster/models.py | 2 | ||||
| -rw-r--r-- | trove/cluster/service.py | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/trove/cluster/models.py b/trove/cluster/models.py index 7ec90f28..0eaf707d 100644 --- a/trove/cluster/models.py +++ b/trove/cluster/models.py @@ -295,6 +295,8 @@ class Cluster(object): instance['name'] = node['name'] if 'volume' in node: instance['volume_size'] = int(node['volume']['size']) + if 'modules' in node: + instance['modules'] = node['modules'] instances.append(instance) return self.grow(instances) elif action == 'shrink': diff --git a/trove/cluster/service.py b/trove/cluster/service.py index 0cb7afc0..8c167d61 100644 --- a/trove/cluster/service.py +++ b/trove/cluster/service.py @@ -158,6 +158,7 @@ class ClusterController(wsgi.Controller): for node in nodes: flavor_id = utils.get_id_from_href(node['flavorRef']) volume_size = volume_type = nics = availability_zone = None + modules = None if 'volume' in node: volume_size = int(node['volume']['size']) volume_type = node['volume'].get('volume_type') @@ -165,12 +166,15 @@ class ClusterController(wsgi.Controller): nics = node['nics'] if 'availability_zone' in node: availability_zone = node['availability_zone'] + if 'modules' in node: + modules = node['modules'] instances.append({"flavor_id": flavor_id, "volume_size": volume_size, "volume_type": volume_type, "nics": nics, - "availability_zone": availability_zone}) + "availability_zone": availability_zone, + "modules": modules}) locality = body['cluster'].get('locality') if locality: |