Merge "Add insecure_registry for cluster template"

This commit is contained in:
Zuul 2018-01-12 03:01:37 +00:00 committed by Gerrit Code Review
commit baeb3c70b8
4 changed files with 20 additions and 0 deletions

View File

@ -37,6 +37,8 @@
<dd>{$ ctrl.cluster_template.docker_storage_driver | noValue $}</dd>
<dt translate>Docker Volume Size</dt>
<dd>{$ ctrl.cluster_template.docker_volume_size | gb | noValue $}</dd>
<dt translate>Insecure Registry</dt>
<dd>{$ ctrl.cluster_template.insecure_registry | noValue $}</dd>
</dl>
</div>
</div>

View File

@ -91,6 +91,8 @@
? response.data.network_driver : "";
config.model.volume_driver = response.data.volume_driver
? response.data.volume_driver : "";
config.model.insecure_registry = response.data.insecure_registry
? response.data.insecure_registry : "";
config.model.http_proxy = response.data.http_proxy
? response.data.http_proxy : "";
config.model.https_proxy = response.data.https_proxy

View File

@ -9,4 +9,6 @@
<dd translate>The nova flavor id to use when launching the master node of the cluster. Default: m1.small</dd>
<dt translate>Docker Volume Size</dt>
<dd translate>The size in GB for Docker Volume. Default: 25</dd>
<dt translate>Insecure Registry</dt>
<dd translate>The URL of docker registry.</dd>
</dl>

View File

@ -133,6 +133,10 @@
placeholder: gettext('Specify the size in GB for the docker volume')
}
},
'insecure_registry': {
title: gettext('Insecure Registry'),
type: 'string'
},
'network_driver': {
title: gettext('Network Driver'),
type: 'string'
@ -340,6 +344,15 @@
key: 'docker_volume_size'
}
]
},
{
type: 'section',
htmlClass: 'col-xs-12',
items: [
{
key: 'insecure_registry'
}
]
}
]
}
@ -457,6 +470,7 @@
keypair_id: "",
network_driver: "",
volume_driver: "",
insecure_registry: "",
http_proxy: "",
https_proxy: "",
no_proxy: "",