Enable external server by default for Huawei hosted k8s

This commit is contained in:
loganhz 2018-12-05 17:42:28 +08:00
parent f122b9bea7
commit 79656b52f5
4 changed files with 22 additions and 25 deletions

View File

@ -180,7 +180,7 @@ export default Component.extend(ClusterDriver, {
rootVolumeType: 'SATA',
nodeCount: 1,
rootVolumeSize: 40,
externalServerEnabled: false,
externalServerEnabled: true,
nodeOperationSystem: 'EulerOS 2.2',
containerNetworkCidr: '172.16.0.0/16',
bmsIsAutoRenew: 'false',
@ -523,12 +523,7 @@ export default Component.extend(ClusterDriver, {
externalServerChange: observer('config.externalServerEnabled', function() {
const externalServerEnabled = get(this, 'config.externalServerEnabled')
if (externalServerEnabled) {
const eipIds = get(this, 'eipIds') || []
const defaultId = eipIds[0] && eipIds[0].id
set(this, 'config.clusterEipId', defaultId)
} else {
if ( !externalServerEnabled ) {
set(this, 'config.clusterEipId', null)
}
}),

View File

@ -278,16 +278,14 @@
{{else}}
<div class="radio">
<label>
{{radio-button selection=config.externalServerEnabled value=false}}
{{t 'generic.disabled'}}
{{radio-button selection=config.externalServerEnabled value=true}}
{{t 'generic.enabled'}}
</label>
</div>
<div class="radio">
<label class={{unless (gt eipIdContent.length 0) 'text-muted'}}>
{{radio-button selection=config.externalServerEnabled value=true disabled=(not (gt eipIdContent.length 0))}}
{{t 'generic.enabled'}}
{{#unless (gt eipIdContent.length 0)}} &mdash; {{t 'clusterNew.huaweicce.eipIds.none'}}
{{/unless}}
<label>
{{radio-button selection=config.externalServerEnabled value=false}}
{{t 'generic.disabled'}}
</label>
</div>
{{/if}}
@ -298,7 +296,9 @@
{{#if editing}}
<div>{{clusterEipName}}</div>
{{else}}
{{new-select classNames="form-control"
{{new-select
classNames="form-control"
prompt=(t 'clusterNew.huaweicce.clusterEipId.prompt')
value=config.clusterEipId
content=eipIdContent
}}

View File

@ -2372,6 +2372,7 @@ clusterNew:
label: Node Label
clusterEipId:
label: Cluster Eip
prompt: Choose a Eip...
externalServerEnabled:
label: External Server
enabled: Enabled

View File

@ -2359,6 +2359,7 @@ clusterNew:
shortLabel: Huawei CCE
clusterEipId:
label: Cluster Eip
prompt: 选择Eip...
externalServerEnabled:
label: 外部服务器
enabled: Enabled