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

Replaced Windows Azure with Microsoft Azure in strings/comments.

Browse Source
This commit is contained in:
Chris Church
2014-08-13 08:20:32 -04:00
parent 3408ac8f88
commit 1b7d94732b
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/models/credential.py
View File

@@ -35,7 +35,7 @@ class Credential(PasswordFieldsModel, CommonModelNameNotUnique):
('rax', _('Rackspace')), ('rax', _('Rackspace')),
('vmware', _('VMware')), ('vmware', _('VMware')),
('gce', _('Google Compute Engine')), ('gce', _('Google Compute Engine')),
('azure', _('Windows Azure')), ('azure', _('Microsoft Azure')),
] ]
PASSWORD_FIELDS = ('password', 'ssh_key_data', 'ssh_key_unlock', PASSWORD_FIELDS = ('password', 'ssh_key_data', 'ssh_key_unlock',

4
awx/main/models/inventory.py
View File

@@ -740,7 +740,7 @@ class InventorySourceOptions(BaseModel):
('rax', _('Rackspace Cloud Servers')), ('rax', _('Rackspace Cloud Servers')),
('ec2', _('Amazon EC2')), ('ec2', _('Amazon EC2')),
('gce', _('Google Compute Engine')), ('gce', _('Google Compute Engine')),
('azure', _('Windows Azure')), ('azure', _('Microsoft Azure')),
('vmware', _('VMWare')), ('vmware', _('VMWare')),
] ]
@@ -829,7 +829,7 @@ class InventorySourceOptions(BaseModel):
@classmethod @classmethod
def get_azure_region_choices(self): def get_azure_region_choices(self):
"""Return a complete list of regions in Windows Azure, as a list of """Return a complete list of regions in Microsoft Azure, as a list of
two-tuples. two-tuples.
""" """
# It's not possible to get a list of regions from Azure without # It's not possible to get a list of regions from Azure without

2
awx/main/tasks.py
View File

@@ -818,7 +818,7 @@ class RunInventoryUpdate(BaseTask):
"""Return private data needed for inventory update. """Return private data needed for inventory update.
If no private data is needed, return None. If no private data is needed, return None.
""" """
# If this is Windows Azure or GCE, return the RSA key # If this is Microsoft Azure or GCE, return the RSA key
if inventory_update.source in ('azure', 'gce'): if inventory_update.source in ('azure', 'gce'):
credential = inventory_update.credential credential = inventory_update.credential
return decrypt_field(credential, 'ssh_key_data') return decrypt_field(credential, 'ssh_key_data')

6
awx/settings/defaults.py
View File

@@ -438,7 +438,7 @@ GCE_INSTANCE_ID_VAR = None
# ------------------- # -------------------
# -- Windows Azure -- # -- Microsoft Azure --
# ------------------- # -------------------
# It's not possible to get zones in Azure without authenticating, so we # It's not possible to get zones in Azure without authenticating, so we
@@ -461,12 +461,12 @@ AZURE_REGION_CHOICES = [
AZURE_REGIONS_BLACKLIST = [] AZURE_REGIONS_BLACKLIST = []
# Inventory variable name/value for determining whether a host is active # Inventory variable name/value for determining whether a host is active
# in Windows Azure. # in Microsoft Azure.
AZURE_ENABLED_VAR = 'status' AZURE_ENABLED_VAR = 'status'
AZURE_ENABLED_VALUE = 'created' AZURE_ENABLED_VALUE = 'created'
# Filter for allowed group and host names when importing inventory from # Filter for allowed group and host names when importing inventory from
# Windows Azure. # Microsoft Azure.
AZURE_GROUP_FILTER = r'^.+$' AZURE_GROUP_FILTER = r'^.+$'
AZURE_HOST_FILTER = r'^.+$' AZURE_HOST_FILTER = r'^.+$'
AZURE_EXCLUDE_EMPTY_GROUPS = True AZURE_EXCLUDE_EMPTY_GROUPS = True

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

@@ -73,7 +73,7 @@ angular.module('CredentialsHelper', ['Utilities'])
scope.sshKeyDataLabel = 'Management Certificate'; scope.sshKeyDataLabel = 'Management Certificate';
scope.subscription_required = true; scope.subscription_required = true;
scope.key_required = true; scope.key_required = true;
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_description = "Paste the contents of the PEM file that corresponds to the certificate you uploaded in the Microsoft 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"; scope.key_hint= "drag and drop a management certificate file on the field below";
break; break;
case 'vmware': case 'vmware':