Rename Savanna to Sahara
Change-Id: I7ab7258d9694e9c2292beb191eb3bc832f207903
This commit is contained in:
parent
b5f9e4fd66
commit
b7c1649380
@ -76,7 +76,7 @@ The test docstrings are another important piece and you should always stick to t
|
||||
|
||||
- test duration - an estimate of how much a test will take
|
||||
|
||||
deployment tags (optional) - gives information about what kind of environment the test will be run, possible values are CENTOS, Ubuntu, RHEL nova_network, Heat, Murano, Savanna)
|
||||
deployment tags (optional) - gives information about what kind of environment the test will be run, possible values are CENTOS, Ubuntu, RHEL nova_network, Heat, Murano, Sahara)
|
||||
|
||||
Here's a test example which confirms the above explanations:
|
||||
|
||||
|
@ -453,10 +453,10 @@
|
||||
additional_components:
|
||||
metadata:
|
||||
weight: 20
|
||||
savanna:
|
||||
sahara:
|
||||
value: false
|
||||
label: "Install Savanna"
|
||||
description: "If selected, Savanna component will be installed"
|
||||
label: "Install Sahara"
|
||||
description: "If selected, Sahara component will be installed"
|
||||
weight: 10
|
||||
type: "checkbox"
|
||||
murano:
|
||||
@ -509,7 +509,7 @@
|
||||
weight: 70
|
||||
type: "text"
|
||||
generated:
|
||||
savanna:
|
||||
sahara:
|
||||
user_password:
|
||||
generator: "password"
|
||||
db_password:
|
||||
|
@ -395,8 +395,8 @@
|
||||
"title": "Additional Services",
|
||||
"release_alert": "Additional services are not available in __releaseName__",
|
||||
"network_mode_alert": "Murano is not available for current network mode. Please choose Neutron networking to enable.",
|
||||
"install_savanna": "Install Savanna",
|
||||
"install_savanna_description": "Savanna enables on demand provisioning of Hadoop clusters to be deployed on OpenStack utilizing a variety of vendor distributions.",
|
||||
"install_sahara": "Install Sahara",
|
||||
"install_sahara_description": "Sahara enables on demand provisioning of Hadoop clusters to be deployed on OpenStack utilizing a variety of vendor distributions.",
|
||||
"install_murano": "Install Murano",
|
||||
"install_murano_description": "Murano enables Windows or Linux based datacenter services like Active Directory, IIS, Apache, Microsoft SQL and ASP.NET to be deployed on OpenStack.",
|
||||
"install_ceilometer": "Install Ceilometer (OpenStack Telemetry)",
|
||||
@ -692,9 +692,9 @@
|
||||
},
|
||||
"additional_components": {
|
||||
"group_name": "额外组件",
|
||||
"savanna": {
|
||||
"label": "安装Savanna",
|
||||
"description": "如果选择,Savanna组件将被安装。"
|
||||
"sahara": {
|
||||
"label": "安装Sahara",
|
||||
"description": "如果选择,Sahara组件将被安装。"
|
||||
},
|
||||
"murano": {
|
||||
"label": "安装Murano",
|
||||
@ -950,8 +950,8 @@
|
||||
"additional": {
|
||||
"title": "附加服务",
|
||||
"release_alert": "__releaseName__不支持附加服务",
|
||||
"install_savanna": "安装Savanna",
|
||||
"install_savanna_description": "利用Savanna能在各大版本厂商的OpenStack上的部署Hadoop集群。",
|
||||
"install_sahara": "安装Sahara",
|
||||
"install_sahara_description": "利用Sahara能在各大版本厂商的OpenStack上的部署Hadoop集群。",
|
||||
"install_murano": "安装Murano",
|
||||
"install_murano_description": "利用Murano能将基于Windows的数据中心服务,如活动目录、IIS、Microsoft SQL和ASP.NET部署到OpenStack上。"
|
||||
},
|
||||
|
@ -490,7 +490,7 @@ function(require, utils, models, simpleMessageTemplate, createClusterWizardTempl
|
||||
try {
|
||||
var additionalServices = settings.get('editable').additional_components;
|
||||
if (additionalServices) {
|
||||
additionalServices.savanna.value = this.$('input[name=savanna]').is(':checked');
|
||||
additionalServices.sahara.value = this.$('input[name=sahara]').is(':checked');
|
||||
additionalServices.murano.value = this.$('input[name=murano]').is(':checked');
|
||||
additionalServices.ceilometer.value = this.$('input[name=ceilometer]').is(':checked');
|
||||
}
|
||||
@ -501,7 +501,7 @@ function(require, utils, models, simpleMessageTemplate, createClusterWizardTempl
|
||||
},
|
||||
render: function() {
|
||||
var release = this.wizard.findPane(clusterWizardPanes.ClusterNameAndReleasePane).release;
|
||||
var disabledDueToRelease = !release || release.get('operating_system') == 'RHEL'; // no Savanna & Murano for RHOS for now
|
||||
var disabledDueToRelease = !release || release.get('operating_system') == 'RHEL'; // no Sahara & Murano for RHOS for now
|
||||
var networkMode = this.wizard.findPane(clusterWizardPanes.ClusterNetworkPane).manager;
|
||||
var disabledDueToNetworkMode = networkMode == 'nova-network'; // no Murano for Nova Network
|
||||
this.$el.html(this.template({
|
||||
|
@ -8,9 +8,9 @@
|
||||
<div class="control-group">
|
||||
<% var services = [
|
||||
{
|
||||
name: 'savanna',
|
||||
label: $.t("dialog.create_cluster_wizard.additional.install_savanna"),
|
||||
description: $.t("dialog.create_cluster_wizard.additional.install_savanna_description")
|
||||
name: 'sahara',
|
||||
label: $.t("dialog.create_cluster_wizard.additional.install_sahara"),
|
||||
description: $.t("dialog.create_cluster_wizard.additional.install_sahara_description")
|
||||
},{
|
||||
name: 'murano',
|
||||
label: $.t("dialog.create_cluster_wizard.additional.install_murano"),
|
||||
|
Loading…
Reference in New Issue
Block a user