External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-16 13:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

VMware support within Tower.

Browse Source
This commit is contained in:
Luke Sneeringer
2014-08-06 09:02:14 -05:00
parent 2abf9ee653
commit 4723ad0a71
80 changed files with 62116 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
awx/ui/static/js/forms/Credentials.js
View File

@@ -149,7 +149,11 @@ angular.module('CredentialFormDefinition', [])
label: 'Host',
type: 'text',
ngShow: "kind.value == 'vmware'",
autocomplete: false
autocomplete: false,
awRequiredWhen: {
variable: 'host_required',
init: false
}
},
"username": {
labelBind: 'usernameLabel',
@@ -216,7 +220,11 @@ angular.module('CredentialFormDefinition', [])
ask: false,
clear: false,
associated: 'password_confirm',
autocomplete: false
autocomplete: false,
awRequiredWhen: {
variable: "password_required",
init: false
}
},
"password_confirm": {
label: 'Confirm Password',
@@ -226,7 +234,11 @@ angular.module('CredentialFormDefinition', [])
editRequired: false,
awPassMatch: true,
associated: 'password',
autocomplete: false
autocomplete: false,
awRequiredWhen: {
variable: "password_required",
init: false
}
},
"ssh_password": {
label: 'SSH Password',

8
awx/ui/static/js/helpers/Credentials.js
View File

@@ -39,6 +39,9 @@ angular.module('CredentialsHelper', ['Utilities'])
scope.subscription_required = false;
scope.key_description = "Paste the contents of the SSH private key file.<div class=\"popover-footer\"><span class=\"key\">esc</span> or click to close</div>";
scope.key_hint= "drag and drop an SSH private key file on the field below";
scope.host_required = false;
scope.password_required = false;
if (!Empty(scope.kind)) {
// Apply kind specific settings
switch (scope.kind.value) {
@@ -72,6 +75,11 @@ angular.module('CredentialsHelper', ['Utilities'])
scope.key_description = "Paste the contents of the PEM file that corresponds to the certificate you uploaded in the Windows Azure console.<div class=\"popover-footer\"><span class=\"key\">esc</span> or click to close</div>";
scope.key_hint= "drag and drop a management certificate file on the field below";
break;
case 'vmware':
scope.username_required = true;
scope.host_required = true;
scope.password_required = true;
break;
}
}

4
awx/ui/static/js/helpers/Groups.js
View File

@@ -252,8 +252,8 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', '
}]);
$('#source_form').addClass('squeeze');
}
if (scope.source.value === 'rax' || scope.source.value === 'ec2'|| scope.source.value==='gce' || scope.source.value === 'azure') {
kind = (scope.source.value === 'rax') ? 'rax' : (scope.source.value==='gce') ? 'gce' : (scope.source.value==='azure') ? 'azure' : 'aws';
if (scope.source.value === 'rax' || scope.source.value === 'ec2'|| scope.source.value==='gce' || scope.source.value === 'azure' || scope.source.value === 'vmware') {
kind = (scope.source.value === 'rax') ? 'rax' : (scope.source.value==='gce') ? 'gce' : (scope.source.value==='azure') ? 'azure' : (scope.source.value === 'vmware') ? 'vmware' : 'aws' ;
url = GetBasePath('credentials') + '?cloud=true&kind=' + kind;
LookUpInit({
url: url,