rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

azure fixes

This commit is contained in:
Westly Wright 2018-02-08 14:49:02 -07:00
parent 9d1b9163a0
commit d9394aec70
No known key found for this signature in database
GPG Key ID: 4FAB3D8673DC54A3
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/global-admin/addon/components/driver/driver-azureaks/component.js
View File

@ -40,7 +40,7 @@ export default Component.extend(ACC, {
memberConfig: M_CONFIG, memberConfig: M_CONFIG,
primaryResource: alias('cluster'), primaryResource: alias('cluster'),
config: alias('cluster.azureKubernetesEngineConfig'), config: alias('cluster.azureKubernetesServiceConfig'),
cluster: null, cluster: null,
errors: null, errors: null,
@ -54,10 +54,11 @@ export default Component.extend(ACC, {
window.gke = this; window.gke = this;
let config = get(this, 'cluster.azureKubernetesEngineConfig'); let config = get(this, 'cluster.azureKubernetesServiceConfig');
if ( !config ) { if ( !config ) {
config = this.get('globalStore').createRecord({ config = this.get('globalStore').createRecord({
type: 'azureKubernetesEngineConfig', agentPoolName: "rancher",
type: 'azureKubernetesServiceConfig',
osDiskSizeGb: 100, osDiskSizeGb: 100,
adminUsername: 'azureuser', adminUsername: 'azureuser',
kubernetesVersion: '1.8.1', kubernetesVersion: '1.8.1',
@ -66,7 +67,7 @@ export default Component.extend(ACC, {
location: 'eastus', location: 'eastus',
}); });
set(this, 'cluster.azureKubernetesEngineConfig', config); set(this, 'cluster.azureKubernetesServiceConfig', config);
} }
}, },

6
lib/global-admin/addon/components/driver/driver-azureaks/template.hbs
View File

@ -27,10 +27,14 @@
<h4>{{t 'machine.driverAzure.accountAccessSection'}}</h4> <h4>{{t 'machine.driverAzure.accountAccessSection'}}</h4>
<div class="row"> <div class="row">
<div class="col span-4"> <div class="col span-6 mb-0">
<label class="acc-label">{{t 'machine.driverAzure.subscriptionId.label'}}{{field-required}}</label> <label class="acc-label">{{t 'machine.driverAzure.subscriptionId.label'}}{{field-required}}</label>
{{input type="text" value=config.subscriptionId classNames="form-control" placeholder=(t 'machine.driverAzure.subscriptionId.placeholder')}} {{input type="text" value=config.subscriptionId classNames="form-control" placeholder=(t 'machine.driverAzure.subscriptionId.placeholder')}}
</div> </div>
<div class="col span-6 mb-0">
<label class="acc-label">{{t 'machine.driverAzure.tenant.label'}}{{field-required}}</label>
{{input type="text" value=config.tenantId classNames="form-control" placeholder=(t 'machine.driverAzure.tenant.placeholder')}}
</div>
</div> </div>
<div class="row"> <div class="row">

3
translations/en-us.yaml
View File

@ -3377,6 +3377,9 @@ machine:
subscriptionId: subscriptionId:
label: Subscription ID label: Subscription ID
placeholder: Your Azure subscription ID placeholder: Your Azure subscription ID
tenant:
label: Tenant ID
placeholder: Your Azure tenant ID
instanceSection: Instance instanceSection: Instance
instanceOptionsSection: Instance Options instanceOptionsSection: Instance Options
image: image: