External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-25 15:06:02 -03:30
Code Issues Packages Projects Releases Wiki Activity

Made username/password/tenant_id/client_id/client_secret all optional when creating an Azure Resource Manager credential.

Browse Source
This commit is contained in:
Michael Abashian
2016-06-01 17:07:33 -04:00
parent 4f4724d1c5
commit beb6be189c
2 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx/ui/client/src/forms/Credentials.js
View File

@@ -310,10 +310,6 @@ export default
client:{ client:{
type: 'text', type: 'text',
label: 'Client ID', label: 'Client ID',
awRequiredWhen: {
reqExpression: "azure_rm_required",
init: false
},
subForm: 'credentialSubForm', subForm: 'credentialSubForm',
ngShow: "kind.value === 'azure_rm'" ngShow: "kind.value === 'azure_rm'"
}, },
@@ -322,20 +318,12 @@ export default
hasShowInputButton: true, hasShowInputButton: true,
autocomplete: false, autocomplete: false,
label: 'Client Secret', label: 'Client Secret',
awRequiredWhen: {
reqExpression: "azure_rm_required",
init: false
},
subForm: 'credentialSubForm', subForm: 'credentialSubForm',
ngShow: "kind.value === 'azure_rm'" ngShow: "kind.value === 'azure_rm'"
}, },
tenant: { tenant: {
type: 'text', type: 'text',
label: 'Tenent ID', label: 'Tenent ID',
awRequiredWhen: {
reqExpression: "azure_rm_required",
init: false
},
subForm: 'credentialSubForm', subForm: 'credentialSubForm',
ngShow: "kind.value === 'azure_rm'" ngShow: "kind.value === 'azure_rm'"
}, },

2
awx/ui/client/src/helpers/Credentials.js
View File

@@ -119,8 +119,6 @@ angular.module('CredentialsHelper', ['Utilities'])
case 'azure_rm': case 'azure_rm':
scope.usernameLabel = "Username"; scope.usernameLabel = "Username";
scope.subscription_required = true; scope.subscription_required = true;
scope.username_required = true;
scope.password_required = true;
scope.passwordLabel = 'Password'; scope.passwordLabel = 'Password';
scope.azure_rm_required = true; scope.azure_rm_required = true;
break; break;