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

Removed UI references to deprecated Azure inv source and cred

Browse Source 
Signed-off-by: mabashian <mabashia@redhat.com>
This commit is contained in:
mabashian
2017-09-14 09:58:53 -04:00
parent 84f9c49b6f
commit e6631d1516
4 changed files with 4 additions and 16 deletions
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": { "subscription": {
label: i18n._("Subscription ID"), label: i18n._("Subscription ID"),
type: 'text', type: 'text',
ngShow: "kind.value == 'azure' || kind.value == 'azure_rm'", ngShow: "kind.value == 'azure_rm'",
awRequiredWhen: { awRequiredWhen: {
reqExpression: 'subscription_required', reqExpression: 'subscription_required',
init: false init: false
@@ -169,7 +169,7 @@ export default ['i18n', function(i18n) {
labelBind: 'usernameLabel', labelBind: 'usernameLabel',
type: 'text', type: 'text',
ngShow: "kind.value && kind.value !== 'aws' && " + ngShow: "kind.value && kind.value !== 'aws' && " +
"kind.value !== 'gce' && kind.value!=='azure'", "kind.value !== 'gce'",
awRequiredWhen: { awRequiredWhen: {
reqExpression: 'username_required', reqExpression: 'username_required',
init: false init: false
@@ -241,7 +241,7 @@ export default ['i18n', function(i18n) {
labelBind: 'sshKeyDataLabel', labelBind: 'sshKeyDataLabel',
type: 'textarea', type: 'textarea',
ngShow: "kind.value == 'ssh' || kind.value == 'scm' || " + ngShow: "kind.value == 'ssh' || kind.value == 'scm' || " +
"kind.value == 'gce' || kind.value == 'azure' || kind.value == 'net'", "kind.value == 'gce' || kind.value == 'net'",
awRequiredWhen: { awRequiredWhen: {
reqExpression: 'key_required', reqExpression: 'key_required',
init: true 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 " + "two words followed by a three digit number. Such " +
"as: ") + "</p><p>adjective-noun-000</p>"; "as: ") + "</p><p>adjective-noun-000</p>";
break; 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': case 'azure_rm':
scope.usernameLabel = i18n._("Username"); scope.usernameLabel = i18n._("Username");
scope.subscription_required = true; 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 " + "two words followed by a three digit number. Such " +
"as: ") + "</p><p>adjective-noun-000</p>"; "as: ") + "</p><p>adjective-noun-000</p>";
break; 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': case 'azure_rm':
scope.usernameLabel = i18n._("Username"); scope.usernameLabel = i18n._("Username");
scope.subscription_required = true; scope.subscription_required = true;

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

@@ -132,7 +132,7 @@ return {
type: 'select', type: 'select',
ngOptions: 'source.label for source in source_region_choices track by source.value', ngOptions: 'source.label for source in source_region_choices track by source.value',
multiSelect: true, 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'), dataTitle: i18n._('Source Regions'),
dataPlacement: 'right', 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") + 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") +