openstack
/
magnum-ui
Code Issues Proposed changes

Add swarm-mode as COE 

Adds the swarm-mode COE to the cluster templates panel.

Story: 2003583
Task: 24889
Change-Id: Ibae5e463a9a93886f467d9424245a2564d383698
This commit is contained in:
Tobias Urdin 2018-08-29 00:18:33 +02:00
parent 340942ea26
commit 5616acfc92
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
magnum_ui/static/dashboard/container-infra/cluster-templates/cluster-templates.module.js
View File

@ -126,6 +126,7 @@
'singleton': true,
options: [
{label: gettext('Docker Swarm'), key: 'swarm'},
{label: gettext('Docker Swarm Mode'), key: 'swarm-mode'},
{label: gettext('Kubernetes'), key: 'kubernetes'},
{label: gettext('DC/OS'), key: 'dcos'},
{label: gettext('Mesos'), key: 'mesos'}

5
magnum_ui/static/dashboard/container-infra/cluster-templates/workflow/workflow.service.js
View File

@ -47,6 +47,7 @@
var schema;
var coes = [{value: '', name: gettext("Choose a Container Orchestration Engine")},
{value: "swarm", name: gettext("Docker Swarm")},
{value: "swarm-mode", name: gettext("Docker Swarm Mode")},
{value: "kubernetes", name: gettext("Kubernetes")},
{value: "mesos", name: gettext("Mesos")},
{value: "dcos", name: gettext("DC/OS")}];
@ -58,6 +59,8 @@
kubernetes: [{value:"flannel", name: gettext("Flannel")}],
swarm: [{value:"docker", name: gettext("Docker")},
{value:"flannel", name: gettext("Flannel")}],
"swarm-mode": [{value:"docker", name: gettext("Docker")},
{value:"flannel", name: gettext("Flannel")}],
mesos: [{value:"docker", name: gettext("Docker")}],
dcos: [{value:"docker", name: gettext("Docker")}]};
var supportedVolumeDrivers = {
@ -68,6 +71,8 @@
{value:"cinder", name: gettext("Cinder")}],
swarm: [{value:"", name: gettext("Choose a Volume Driver")},
{value:"rexray", name: gettext("Rexray")}],
"swarm-mode": [{value:"", name: gettext("Choose a Volume Driver")},
{value:"rexray", name: gettext("Rexray")}],
mesos: [{value:"", name: gettext("Choose a Volume Driver")},
{value:"rexray", name: gettext("Rexray")}],
dcos: [{value:"", name: gettext("Choose a Volume Driver")},

4
magnum_ui/static/dashboard/container-infra/cluster-templates/workflow/workflow.service.spec.js
View File

@ -54,6 +54,10 @@
config.form[0].tabs[0].items[0].items[1].onChange();
config.model.coe = 'swarm';
config.form[0].tabs[0].items[0].items[1].onChange();
config.model.coe = 'swarm-mode';
config.form[0].tabs[0].items[0].items[1].onChange();
expect(config.form[0].tabs[2].items[0].items[0].items[0].titleMap[0].value).toEqual('docker');
}));
});