openstack/magnum-ui
Code Issues Proposed changes

Merge "Add dcos support for magnum-ui"

Browse Source
This commit is contained in:
Jenkins
2017-05-16 03:46:01 +00:00
committed by Gerrit Code Review
parent 80e3b97850 707233cb35
commit 13d4f35015
2 changed files with 7 additions and 2 deletions
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

@@ -127,6 +127,7 @@
options: [ options: [
{label: gettext('Docker Swarm'), key: 'swarm'}, {label: gettext('Docker Swarm'), key: 'swarm'},
{label: gettext('Kubernetes'), key: 'kubernetes'}, {label: gettext('Kubernetes'), key: 'kubernetes'},
{label: gettext('DC/OS'), key: 'dcos'},
{label: gettext('Mesos'), key: 'mesos'} {label: gettext('Mesos'), key: 'mesos'}
] ]
}); });

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

@@ -46,7 +46,8 @@
var coes = [{value: '', name: gettext("Choose a Container Orchestration Engine")}, var coes = [{value: '', name: gettext("Choose a Container Orchestration Engine")},
{value: "swarm", name: gettext("Docker Swarm")}, {value: "swarm", name: gettext("Docker Swarm")},
{value: "kubernetes", name: gettext("Kubernetes")}, {value: "kubernetes", name: gettext("Kubernetes")},
{value: "mesos", name: gettext("Mesos")}]; {value: "mesos", name: gettext("Mesos")},
{value: "dcos", name: gettext("DC/OS")}];
/* default is first value */ /* default is first value */
var supportedNetworkDrivers = { var supportedNetworkDrivers = {
initial: [{value:"", name: gettext("Choose a Network Driver")}, initial: [{value:"", name: gettext("Choose a Network Driver")},
@@ -55,7 +56,8 @@
kubernetes: [{value:"flannel", name: gettext("Flannel")}], kubernetes: [{value:"flannel", name: gettext("Flannel")}],
swarm: [{value:"docker", name: gettext("Docker")}, swarm: [{value:"docker", name: gettext("Docker")},
{value:"flannel", name: gettext("Flannel")}], {value:"flannel", name: gettext("Flannel")}],
mesos: [{value:"docker", name: gettext("Docker")}]}; mesos: [{value:"docker", name: gettext("Docker")}],
dcos: [{value:"docker", name: gettext("Docker")}]};
var supportedVolumeDrivers = { var supportedVolumeDrivers = {
initial: [{value:"", name: gettext("Choose a Volume Driver")}, initial: [{value:"", name: gettext("Choose a Volume Driver")},
{value: "cinder", name: gettext("Cinder")}, {value: "cinder", name: gettext("Cinder")},
@@ -65,6 +67,8 @@
swarm: [{value:"", name: gettext("Choose a Volume Driver")}, swarm: [{value:"", name: gettext("Choose a Volume Driver")},
{value:"rexray", name: gettext("Rexray")}], {value:"rexray", name: gettext("Rexray")}],
mesos: [{value:"", name: gettext("Choose a Volume Driver")}, mesos: [{value:"", name: gettext("Choose a Volume Driver")},
{value:"rexray", name: gettext("Rexray")}],
dcos: [{value:"", name: gettext("Choose a Volume Driver")},
{value:"rexray", name: gettext("Rexray")}]}; {value:"rexray", name: gettext("Rexray")}]};
// schema // schema