From 52d8fb5b5c4d1fa17c17cd1b2d90bcc055952df0 Mon Sep 17 00:00:00 2001
From: Chris Church <chris@ninemoreminutes.com>
Date: Tue, 15 Oct 2013 17:35:39 -0400
Subject: [PATCH] AC-556 Renaming the inventory script to hopefully fix the
 import error.

---
 awx/main/tasks.py                            | 2 +-
 awx/main/tests/scripts.py                    | 2 +-
 awx/plugins/inventory/{awx.py => awxrest.py} | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename awx/plugins/inventory/{awx.py => awxrest.py} (100%)

diff --git a/awx/main/tasks.py b/awx/main/tasks.py
index 4b3a2dd9b6..3e55337101 100644
--- a/awx/main/tasks.py
+++ b/awx/main/tasks.py
@@ -348,7 +348,7 @@ class RunJob(BaseTask):
         # the current user.
         ssh_username = ssh_username or 'root'
         inventory_script = self.get_path_to('..', 'plugins', 'inventory',
-                                            'awx.py')
+                                            'awxrest.py')
         args = ['ansible-playbook', '-i', inventory_script]
         if job.job_type == 'check':
             args.append('--check')
diff --git a/awx/main/tests/scripts.py b/awx/main/tests/scripts.py
index da43f370e5..5ed72a1ebe 100644
--- a/awx/main/tests/scripts.py
+++ b/awx/main/tests/scripts.py
@@ -131,7 +131,7 @@ class InventoryScriptTest(BaseScriptTest):
         #os.environ.setdefault('REST_API_TOKEN',
         #                      self.super_django_user.auth_token.key)
         name = os.path.join(os.path.dirname(__file__), '..', '..', 'plugins',
-                            'inventory', 'awx.py')
+                            'inventory', 'awxrest.py')
         return self.run_script(name, *args, **options)
 
     def test_without_inventory_id(self):
diff --git a/awx/plugins/inventory/awx.py b/awx/plugins/inventory/awxrest.py
similarity index 100%
rename from awx/plugins/inventory/awx.py
rename to awx/plugins/inventory/awxrest.py