From c4825dbf6cdc94d98052b1db48a74022fb776e9c Mon Sep 17 00:00:00 2001
From: Luke Sneeringer <luke@sneeringer.com>
Date: Thu, 14 Aug 2014 14:59:37 -0400
Subject: [PATCH] Fix VMware capitalization

---
 awx/main/models/credential.py   | 6 +++---
 awx/main/models/inventory.py    | 6 +++---
 awx/plugins/inventory/vmware.py | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/awx/main/models/credential.py b/awx/main/models/credential.py
index 5387bea740..c8cb331587 100644
--- a/awx/main/models/credential.py
+++ b/awx/main/models/credential.py
@@ -176,7 +176,7 @@ class Credential(PasswordFieldsModel, CommonModelNameNotUnique):
         """
         host = self.host or ''
         if not host and self.kind == 'vmware':
-            raise ValidationError('Host required for VMWare credential.')
+            raise ValidationError('Host required for VMware credential.')
         return host
 
     def clean_username(self):
@@ -187,7 +187,7 @@ class Credential(PasswordFieldsModel, CommonModelNameNotUnique):
             raise ValidationError('Username required for Rackspace '
                                   'credential.')
         if not username and self.kind == 'vmware':
-            raise ValidationError('Username required for VMWare credential.')
+            raise ValidationError('Username required for VMware credential.')
         return username
 
     def clean_password(self):
@@ -197,7 +197,7 @@ class Credential(PasswordFieldsModel, CommonModelNameNotUnique):
         if not password and self.kind == 'rax':
             raise ValidationError('API key required for Rackspace credential.')
         if not password and self.kind == 'vmware':
-            raise ValidationError('Password required for VMWare credential.')
+            raise ValidationError('Password required for VMware credential.')
         return password
 
     def _validate_ssh_private_key(self, data):
diff --git a/awx/main/models/inventory.py b/awx/main/models/inventory.py
index d9878ebfea..0d249adaa2 100644
--- a/awx/main/models/inventory.py
+++ b/awx/main/models/inventory.py
@@ -757,7 +757,7 @@ class InventorySourceOptions(BaseModel):
         ('ec2',    _('Amazon EC2')),
         ('gce',    _('Google Compute Engine')),
         ('azure',  _('Microsoft Azure')),
-        ('vmware', _('VMWare')),
+        ('vmware', _('VMware')),
     ]
 
     class Meta:
@@ -858,8 +858,8 @@ class InventorySourceOptions(BaseModel):
 
     @classmethod
     def get_vmware_region_choices(self):
-        """Return a complete list of regions in VMWare, as a list of two-tuples
-        (but note that VMWare doesn't actually have regions!).
+        """Return a complete list of regions in VMware, as a list of two-tuples
+        (but note that VMware doesn't actually have regions!).
         """
         return [('all', 'All')]
 
diff --git a/awx/plugins/inventory/vmware.py b/awx/plugins/inventory/vmware.py
index 5c75eece55..51817f4129 100755
--- a/awx/plugins/inventory/vmware.py
+++ b/awx/plugins/inventory/vmware.py
@@ -210,7 +210,7 @@ if __name__ == '__main__':
     except Exception:
         pass
 
-    # If any of the VMWare environment variables are set, they trump
+    # If any of the VMware environment variables are set, they trump
     # the INI configuration.
     if 'VMWARE_HOST' in os.environ:
         auth_host = os.environ['VMWARE_HOST']
@@ -219,7 +219,7 @@ if __name__ == '__main__':
     if 'VMWARE_PASSWORD' in os.environ:
         auth_password = os.environ['VMWARE_PASSWORD']
 
-    # Create the VMWare client.
+    # Create the VMware client.
     client = Client(auth_host, auth_user, auth_password)
 
     # Actually do the work.