Merge "Add swarm-mode as COE"
This commit is contained in:
commit
f582f877df
@ -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'}
|
||||
|
@ -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")},
|
||||
|
@ -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');
|
||||
}));
|
||||
|
||||
});
|
||||
|
Loading…
Reference in New Issue
Block a user