openstack
/
python-magnumclient
Code Issues Proposed changes

Magnum client suport insecure_registry 

Change-Id: Iaf2c967d4d145aea8c3c127a2c1169105479d98a
Partially-Implements: blueprint support-insecure-registry
This commit is contained in:
coldmoment 2017-05-12 08:20:21 +08:00
parent 32e15d5e11
commit 9e372baad4
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
magnumclient/tests/v1/test_clustertemplates_shell.py
View File

@ -57,7 +57,8 @@ class ShellTest(shell_test_base.TestCommandLineArgument):
tls_disabled=False, public=False,
master_lb_enabled=False, server_type='vm',
floating_ip_enabled=True,
registry_enabled=False):
registry_enabled=False,
insecure_registry=None):
expected_args = {}
expected_args['image_id'] = image_id
@ -84,6 +85,7 @@ class ShellTest(shell_test_base.TestCommandLineArgument):
expected_args['server_type'] = server_type
expected_args['floating_ip_enabled'] = floating_ip_enabled
expected_args['registry_enabled'] = registry_enabled
expected_args['insecure_registry'] = insecure_registry
return expected_args

1
magnumclient/v1/cluster_templates.py
View File

@ -14,6 +14,7 @@ from magnumclient.v1 import basemodels
CREATION_ATTRIBUTES = basemodels.CREATION_ATTRIBUTES
CREATION_ATTRIBUTES.append('insecure_registry')
class ClusterTemplate(basemodels.BaseModel):

4
magnumclient/v1/cluster_templates_shell.py
View File

@ -174,6 +174,9 @@ def _show_cluster_template(cluster_template):
action='store_true', default=True,
help=_('Indicates whether created Clusters should have a '
'floating ip or not.'))
@utils.arg('--insecure-registry',
metavar='<insecure-registry>',
help='url of docker registry')
def do_cluster_template_create(cs, args):
"""Create a cluster template."""
args.command = 'cluster-template-create'
@ -205,6 +208,7 @@ def do_cluster_template_create(cs, args):
opts['server_type'] = args.server_type
opts['master_lb_enabled'] = args.master_lb_enabled
opts['floating_ip_enabled'] = args.floating_ip_enabled
opts['insecure_registry'] = args.insecure_registry
cluster_template = cs.cluster_templates.create(**opts)
_show_cluster_template(cluster_template)