openstack
/
python-magnumclient
Code Issues Proposed changes

OSC: Add --master-flavor to coe cluster create 

Add a master-flavor override parameter on osc cluster create to override
the value present on the cluster template.

Partial-Bug: #1699247
Depends-On: Id1d973167b381538121583a0a9691304b39e98de
Change-Id: I7ef1c2d7c19be96089fbe0f0847294073ccab04e
This commit is contained in:
Ricardo Rocha 2017-08-01 14:36:24 +00:00 committed by Spyros Trigazis (strigazi)
parent 056e57deba
commit c035f9299f
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
magnumclient/osc/v1/clusters.py
View File

@ -42,7 +42,8 @@ CLUSTER_ATTRIBUTES = [
'discovery_url', 'discovery_url',
'master_count', 'master_count',
'container_version', 'container_version',
'name' 'name',
'master_flavor_id',
] ]
@ -101,6 +102,12 @@ class CreateCluster(command.Command):
metavar='<timeout>', metavar='<timeout>',
help=('The timeout for cluster creation time. The ' help=('The timeout for cluster creation time. The '
'default is 60 minutes.')) 'default is 60 minutes.'))
parser.add_argument(
'--master-flavor',
dest='master_flavor',
metavar='<master-flavor>',
help=_('The nova flavor name or UUID to use when launching the '
'master node of the Cluster.'))
return parser return parser
@ -117,6 +124,7 @@ class CreateCluster(command.Command):
'master_count': parsed_args.master_count, 'master_count': parsed_args.master_count,
'name': parsed_args.name, 'name': parsed_args.name,
'node_count': parsed_args.node_count, 'node_count': parsed_args.node_count,
'master_flavor_id': parsed_args.master_flavor,
} }
if parsed_args.labels is not None: if parsed_args.labels is not None:

3
magnumclient/tests/osc/unit/v1/fakes.py
View File

@ -200,7 +200,8 @@ class FakeCluster(object):
'discovery_url': 'https://fake.cluster', 'discovery_url': 'https://fake.cluster',
'master_count': 1, 'master_count': 1,
'container_version': None, 'container_version': None,
'name': 'fake-cluster' 'name': 'fake-cluster',
'master_flavor_id': None,
} }
# Overwrite default attributes. # Overwrite default attributes.

3
magnumclient/tests/osc/unit/v1/test_clusters.py
View File

@ -47,7 +47,8 @@ class TestClusterCreate(TestCluster):
'keypair': None, 'keypair': None,
'master_count': 1, 'master_count': 1,
'name': 'fake-cluster-1', 'name': 'fake-cluster-1',
'node_count': 1 'node_count': 1,
'master_flavor_id': None,
} }
self.clusters_mock.create = mock.Mock() self.clusters_mock.create = mock.Mock()