From e88dd2c6d6b795fe076cb2b738f10c3e32e201a3 Mon Sep 17 00:00:00 2001 From: Shu Muto Date: Wed, 27 Dec 2017 11:17:06 +0900 Subject: [PATCH] Add insecure_registry for cluster template This patch adds insecure_registry parameter for cluster template into create action, update action and details view. Change-Id: Id1b50aa9955819de0da33a3ce6cc5a1a397c27bd --- .../cluster-templates/details/overview.html | 2 ++ .../cluster-templates/update/update.service.js | 2 ++ .../cluster-templates/workflow/spec.help.html | 2 ++ .../cluster-templates/workflow/workflow.service.js | 14 ++++++++++++++ 4 files changed, 20 insertions(+) diff --git a/magnum_ui/static/dashboard/container-infra/cluster-templates/details/overview.html b/magnum_ui/static/dashboard/container-infra/cluster-templates/details/overview.html index 69ec7c72..13c2497c 100644 --- a/magnum_ui/static/dashboard/container-infra/cluster-templates/details/overview.html +++ b/magnum_ui/static/dashboard/container-infra/cluster-templates/details/overview.html @@ -37,6 +37,8 @@
{$ ctrl.cluster_template.docker_storage_driver | noValue $}
Docker Volume Size
{$ ctrl.cluster_template.docker_volume_size | gb | noValue $}
+
Insecure Registry
+
{$ ctrl.cluster_template.insecure_registry | noValue $}
diff --git a/magnum_ui/static/dashboard/container-infra/cluster-templates/update/update.service.js b/magnum_ui/static/dashboard/container-infra/cluster-templates/update/update.service.js index e9cd0643..6d7eb017 100644 --- a/magnum_ui/static/dashboard/container-infra/cluster-templates/update/update.service.js +++ b/magnum_ui/static/dashboard/container-infra/cluster-templates/update/update.service.js @@ -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 diff --git a/magnum_ui/static/dashboard/container-infra/cluster-templates/workflow/spec.help.html b/magnum_ui/static/dashboard/container-infra/cluster-templates/workflow/spec.help.html index acb3b4d4..e28155d6 100644 --- a/magnum_ui/static/dashboard/container-infra/cluster-templates/workflow/spec.help.html +++ b/magnum_ui/static/dashboard/container-infra/cluster-templates/workflow/spec.help.html @@ -9,4 +9,6 @@
The nova flavor id to use when launching the master node of the cluster. Default: m1.small
Docker Volume Size
The size in GB for Docker Volume. Default: 25
+
Insecure Registry
+
The URL of docker registry.
\ No newline at end of file diff --git a/magnum_ui/static/dashboard/container-infra/cluster-templates/workflow/workflow.service.js b/magnum_ui/static/dashboard/container-infra/cluster-templates/workflow/workflow.service.js index dd4aefe9..c4ec8c50 100644 --- a/magnum_ui/static/dashboard/container-infra/cluster-templates/workflow/workflow.service.js +++ b/magnum_ui/static/dashboard/container-infra/cluster-templates/workflow/workflow.service.js @@ -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: "",