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

AC-613 Change rackspace to rax for inventory source field value.

Browse Source
This commit is contained in:
Chris Church
2013-11-16 16:48:27 -05:00
parent 902c7c2d72
commit f254f8bc92
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/tasks.py
View File

@@ -816,7 +816,7 @@ class RunInventoryUpdate(BaseTask):
args.extend(['--enabled-var', 'ec2_state']) args.extend(['--enabled-var', 'ec2_state'])
args.extend(['--enabled-value', 'running']) args.extend(['--enabled-value', 'running'])
#args.extend(['--instance-id', 'ec2_id']) #args.extend(['--instance-id', 'ec2_id'])
elif inventory_source.source in == 'rax': elif inventory_source.source == 'rax':
rax_path = self.get_path_to('..', 'plugins', 'inventory', 'rax.py') rax_path = self.get_path_to('..', 'plugins', 'inventory', 'rax.py')
args.append(rax_path) args.append(rax_path)
args.extend(['--enabled-var', 'rax_status']) args.extend(['--enabled-var', 'rax_status'])

2
awx/ui/static/js/forms/Groups.js
View File

@@ -126,7 +126,7 @@ angular.module('GroupFormDefinition', [])
label: 'Regions', label: 'Regions',
excludeModal: true, excludeModal: true,
type: 'text', type: 'text',
ngShow: "source.value == 'rackspace' || source.value == 'ec2'", ngShow: "source.value == 'rax' || source.value == 'ec2'",
addRequired: false, addRequired: false,
editRequired: false, editRequired: false,
dataTitle: 'Source Regions', dataTitle: 'Source Regions',

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

@@ -806,7 +806,7 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', '
LookUpInit({ LookUpInit({
url: GetBasePath('credentials') + url: GetBasePath('credentials') +
'?cloud=true&kind=' + [(scope.source.value == 'rackspace') ? 'rax' : 'aws'], '?cloud=true&kind=' + [(scope.source.value == 'rax') ? 'rax' : 'aws'],
scope: scope, scope: scope,
form: form, form: form,
list: CredentialList, list: CredentialList,
@@ -1000,7 +1000,7 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', '
} }
LookUpInit({ LookUpInit({
url: GetBasePath('credentials') + url: GetBasePath('credentials') +
'?cloud=true&kind=' + [(scope.source.value == 'rackspace') ? 'rax' : 'aws'], '?cloud=true&kind=' + [(scope.source.value == 'rax') ? 'rax' : 'aws'],
scope: scope, scope: scope,
form: form, form: form,
list: CredentialList, list: CredentialList,

4
awx/ui/static/js/lists/HomeGroups.js
View File

@@ -78,7 +78,7 @@ angular.module('HomeGroupListDefinition', [])
searchOptions: [ searchOptions: [
{ name: "ec2", value: "ec2" }, { name: "ec2", value: "ec2" },
{ name: "none", value: "" }, { name: "none", value: "" },
{ name: "rackspace", value: "rackspace" }], { name: "rax", value: "rax" }],
sourceModel: 'inventory_source', sourceModel: 'inventory_source',
sourceField: 'source', sourceField: 'source',
searchOnly: true searchOnly: true
@@ -86,7 +86,7 @@ angular.module('HomeGroupListDefinition', [])
has_external_source: { has_external_source: {
label: 'Has external source?', label: 'Has external source?',
searchType: 'in', searchType: 'in',
searchValue: 'ec2,rackspace', searchValue: 'ec2,rax',
searchOnly: true, searchOnly: true,
sourceModel: 'inventory_source', sourceModel: 'inventory_source',
sourceField: 'source' sourceField: 'source'

4
awx/ui/static/js/lists/InventorySummary.js
View File

@@ -71,7 +71,7 @@ angular.module('InventorySummaryDefinition', [])
searchOptions: [ searchOptions: [
{ name: "ec2", value: "ec2" }, { name: "ec2", value: "ec2" },
{ name: "none", value: "" }, { name: "none", value: "" },
{ name: "rackspace", value: "rackspace" }], { name: "rax", value: "rax" }],
sourceModel: 'inventory_source', sourceModel: 'inventory_source',
sourceField: 'source', sourceField: 'source',
searchOnly: true searchOnly: true
@@ -79,7 +79,7 @@ angular.module('InventorySummaryDefinition', [])
has_external_source: { has_external_source: {
label: 'Has external source?', label: 'Has external source?',
searchType: 'in', searchType: 'in',
searchValue: 'ec2,rackspace', searchValue: 'ec2,rax',
searchOnly: true, searchOnly: true,
sourceModel: 'inventory_source', sourceModel: 'inventory_source',
sourceField: 'source' sourceField: 'source'

4
awx/ui/static/js/widgets/InventorySyncStatus.js
View File

@@ -134,7 +134,7 @@ angular.module('InventorySyncStatusWidget', ['RestServices', 'Utilities'])
{ hdr: 'Error!', msg: 'Failed to get ' + url + '. GET status: ' + status }); { hdr: 'Error!', msg: 'Failed to get ' + url + '. GET status: ' + status });
}); });
url = GetBasePath('inventory_sources') + '?source__in=ec2,rackspace&page=1'; url = GetBasePath('inventory_sources') + '?source__in=ec2,rax&page=1';
Rest.setUrl(url); Rest.setUrl(url);
Rest.get() Rest.get()
.success( function(data, status, headers, config) { .success( function(data, status, headers, config) {
@@ -146,7 +146,7 @@ angular.module('InventorySyncStatusWidget', ['RestServices', 'Utilities'])
{ hdr: 'Error!', msg: 'Failed to get ' + url + '. GET status: ' + status }); { hdr: 'Error!', msg: 'Failed to get ' + url + '. GET status: ' + status });
}); });
url = GetBasePath('inventory_sources') + '?status=failed&source__in=ec2,rackspace&page=1'; url = GetBasePath('inventory_sources') + '?status=failed&source__in=ec2,rax&page=1';
Rest.setUrl(url); Rest.setUrl(url);
Rest.get() Rest.get()
.success( function(data, status, headers, config) { .success( function(data, status, headers, config) {