Merge "Add insecure_registry property to coe_cluster_templates"
This commit is contained in:
commit
fa6eb547ab
@ -80,6 +80,10 @@ options:
|
|||||||
- Magnum's default value for I(is_registry_enabled) is C(false).
|
- Magnum's default value for I(is_registry_enabled) is C(false).
|
||||||
type: bool
|
type: bool
|
||||||
aliases: ['registry_enabled']
|
aliases: ['registry_enabled']
|
||||||
|
insecure_registry:
|
||||||
|
description:
|
||||||
|
- The URL pointing to users own private insecure docker registry.
|
||||||
|
type: str
|
||||||
is_tls_disabled:
|
is_tls_disabled:
|
||||||
description:
|
description:
|
||||||
- Indicates whether the TLS should be disabled.
|
- Indicates whether the TLS should be disabled.
|
||||||
@ -342,6 +346,7 @@ class COEClusterTemplateModule(OpenStackModule):
|
|||||||
keypair_id=dict(),
|
keypair_id=dict(),
|
||||||
labels=dict(type='raw'),
|
labels=dict(type='raw'),
|
||||||
master_flavor_id=dict(),
|
master_flavor_id=dict(),
|
||||||
|
insecure_registry=dict(),
|
||||||
is_master_lb_enabled=dict(type='bool', default=False,
|
is_master_lb_enabled=dict(type='bool', default=False,
|
||||||
aliases=['master_lb_enabled']),
|
aliases=['master_lb_enabled']),
|
||||||
is_public=dict(type='bool', aliases=['public']),
|
is_public=dict(type='bool', aliases=['public']),
|
||||||
@ -412,6 +417,7 @@ class COEClusterTemplateModule(OpenStackModule):
|
|||||||
'fixed_subnet', 'flavor_id',
|
'fixed_subnet', 'flavor_id',
|
||||||
'http_proxy', 'https_proxy',
|
'http_proxy', 'https_proxy',
|
||||||
'image_id',
|
'image_id',
|
||||||
|
'insecure_registry',
|
||||||
'is_floating_ip_enabled',
|
'is_floating_ip_enabled',
|
||||||
'is_master_lb_enabled',
|
'is_master_lb_enabled',
|
||||||
'is_public', 'is_registry_enabled',
|
'is_public', 'is_registry_enabled',
|
||||||
@ -458,7 +464,7 @@ class COEClusterTemplateModule(OpenStackModule):
|
|||||||
'external_network_id', 'fixed_network',
|
'external_network_id', 'fixed_network',
|
||||||
'fixed_subnet', 'flavor_id', 'http_proxy',
|
'fixed_subnet', 'flavor_id', 'http_proxy',
|
||||||
'https_proxy', 'image_id',
|
'https_proxy', 'image_id',
|
||||||
'is_floating_ip_enabled',
|
'insecure_registry', 'is_floating_ip_enabled',
|
||||||
'is_master_lb_enabled', 'is_public',
|
'is_master_lb_enabled', 'is_public',
|
||||||
'is_registry_enabled', 'is_tls_disabled',
|
'is_registry_enabled', 'is_tls_disabled',
|
||||||
'keypair_id', 'master_flavor_id', 'name',
|
'keypair_id', 'master_flavor_id', 'name',
|
||||||
|
Loading…
x
Reference in New Issue
Block a user