From 707233cb356dd773384ff3b012f59819884d104b Mon Sep 17 00:00:00 2001 From: fengbeihong Date: Wed, 9 Nov 2016 14:36:13 +0800 Subject: [PATCH] Add dcos support for magnum-ui Depends-On: I58b378b4bd6df34fd43307e4252cfbbd9bf593d8 Change-Id: I1d2290c93d9ee1717562bf6ef6a3fca02dd53d93 Partially-Implements: blueprint mesos-dcos --- .../cluster-templates/cluster-templates.module.js | 1 + .../cluster-templates/workflow/workflow.service.js | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/magnum_ui/static/dashboard/container-infra/cluster-templates/cluster-templates.module.js b/magnum_ui/static/dashboard/container-infra/cluster-templates/cluster-templates.module.js index fe65f1e6..77791242 100644 --- a/magnum_ui/static/dashboard/container-infra/cluster-templates/cluster-templates.module.js +++ b/magnum_ui/static/dashboard/container-infra/cluster-templates/cluster-templates.module.js @@ -127,6 +127,7 @@ options: [ {label: gettext('Docker Swarm'), key: 'swarm'}, {label: gettext('Kubernetes'), key: 'kubernetes'}, + {label: gettext('DC/OS'), key: 'dcos'}, {label: gettext('Mesos'), key: 'mesos'} ] }); 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 11fb206c..cbb4cfa0 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 @@ -46,7 +46,8 @@ var coes = [{value: '', name: gettext("Choose a Container Orchestration Engine")}, {value: "swarm", name: gettext("Docker Swarm")}, {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 */ var supportedNetworkDrivers = { initial: [{value:"", name: gettext("Choose a Network Driver")}, @@ -55,7 +56,8 @@ kubernetes: [{value:"flannel", name: gettext("Flannel")}], swarm: [{value:"docker", name: gettext("Docker")}, {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 = { initial: [{value:"", name: gettext("Choose a Volume Driver")}, {value: "cinder", name: gettext("Cinder")}, @@ -65,6 +67,8 @@ swarm: [{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")}, {value:"rexray", name: gettext("Rexray")}]}; // schema