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

Merge pull request #410 from mabashian/7629-remove-deprecated-azure

Browse Source 
Removed UI references to deprecated Azure inv source and cred
This commit is contained in:
Michael Abashian 2017-09-18 13:08:25 -04:00 committed by GitHub
commit 50d6981695
6 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
awx/ui/client/src/credentials/credentials.form.js
View File

@ -150,7 +150,7 @@ export default ['i18n', function(i18n) {
"subscription": {
label: i18n._("Subscription ID"),
type: 'text',
ngShow: "kind.value == 'azure' || kind.value == 'azure_rm'",
ngShow: "kind.value == 'azure_rm'",
awRequiredWhen: {
reqExpression: 'subscription_required',
init: false
@ -169,7 +169,7 @@ export default ['i18n', function(i18n) {
labelBind: 'usernameLabel',
type: 'text',
ngShow: "kind.value && kind.value !== 'aws' && " +
"kind.value !== 'gce' && kind.value!=='azure'",
"kind.value !== 'gce'",
awRequiredWhen: {
reqExpression: 'username_required',
init: false
@ -241,7 +241,7 @@ export default ['i18n', function(i18n) {
labelBind: 'sshKeyDataLabel',
type: 'textarea',
ngShow: "kind.value == 'ssh' || kind.value == 'scm' || " +
"kind.value == 'gce' || kind.value == 'azure' || kind.value == 'net'",
"kind.value == 'gce' || kind.value == 'net'",
awRequiredWhen: {
reqExpression: 'key_required',
init: true

6
awx/ui/client/src/credentials/factories/become-method-change.factory.js
View File

@ -34,12 +34,6 @@ export default
"two words followed by a three digit number. Such " +
"as: ") + "</p><p>adjective-noun-000</p>";
break;
case 'azure':
scope.sshKeyDataLabel = i18n._('Management Certificate');
scope.subscription_required = true;
scope.key_required = true;
scope.key_description = i18n._("Paste the contents of the PEM file that corresponds to the certificate you uploaded in the Microsoft Azure console.");
break;
case 'azure_rm':
scope.usernameLabel = i18n._("Username");
scope.subscription_required = true;

6
awx/ui/client/src/credentials/factories/kind-change.factory.js
View File

@ -91,12 +91,6 @@ export default
"two words followed by a three digit number. Such " +
"as: ") + "</p><p>adjective-noun-000</p>";
break;
case 'azure':
scope.sshKeyDataLabel = i18n._('Management Certificate');
scope.subscription_required = true;
scope.key_required = true;
scope.key_description = i18n._("Paste the contents of the PEM file that corresponds to the certificate you uploaded in the Microsoft Azure console.");
break;
case 'azure_rm':
scope.usernameLabel = i18n._("Username");
scope.subscription_required = true;

2
awx/ui/client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js
View File

@ -251,7 +251,7 @@ export default ['$state', '$stateParams', '$scope', 'SourcesFormDefinition',
scope: $scope,
field: 'source_regions',
variable: 'azure_regions',
choice_name: 'azure_region_choices',
choice_name: 'azure_rm_region_choices',
options: inventorySourcesOptions
});

2
awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js
View File

@ -218,7 +218,7 @@ export default ['$state', '$stateParams', '$scope', 'ParseVariableString',
scope: $scope,
field: 'source_regions',
variable: 'azure_regions',
choice_name: 'azure_region_choices',
choice_name: 'azure_rm_region_choices',
options: inventorySourcesOptions
});
GetChoices({

2
awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.form.js
View File

@ -132,7 +132,7 @@ return {
type: 'select',
ngOptions: 'source.label for source in source_region_choices track by source.value',
multiSelect: true,
ngShow: "source && (source.value == 'rax' || source.value == 'ec2' || source.value == 'gce' || source.value == 'azure' || source.value == 'azure_rm')",
ngShow: "source && (source.value == 'rax' || source.value == 'ec2' || source.value == 'gce' || source.value == 'azure_rm')",
dataTitle: i18n._('Source Regions'),
dataPlacement: 'right',
awPopOver: "<p>" + i18n._("Click on the regions field to see a list of regions for your cloud provider. You can select multiple regions, or choose") +