Merge pull request #127 from twiest/pr

created a python package named openshift_ansible

6 files changed, 9 insertions, 5 deletions

diff --git a/bin/openshift-ansible-bin.spec b/bin/openshift-ansible-bin.spec
index 38e0a0d59..349cd3059 100644
--- a/bin/openshift-ansible-bin.spec
+++ b/bin/openshift-ansible-bin.spec
@@ -24,7 +24,7 @@ mkdir -p %{buildroot}/etc/bash_completion.d
 mkdir -p %{buildroot}/etc/openshift_ansible
 
 cp -p ossh oscp opssh %{buildroot}%{_bindir}
-cp -p awsutil.py %{buildroot}%{python_sitelib}/openshift_ansible
+cp -p openshift_ansible/* %{buildroot}%{python_sitelib}/openshift_ansible
 cp -p ossh_bash_completion %{buildroot}/etc/bash_completion.d
 
 cp -p openshift_ansible.conf.example %{buildroot}/etc/openshift_ansible/openshift_ansible.conf
diff --git a/bin/openshift_ansible/__init__.py b/bin/openshift_ansible/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/bin/openshift_ansible/__init__.py
diff --git a/bin/awsutil.py b/bin/openshift_ansible/awsutil.py
index 78421e5f5..8fef0a24f 100644
--- a/bin/awsutil.py
+++ b/bin/openshift_ansible/awsutil.py
@@ -12,7 +12,8 @@ class AwsUtil(object):
 
         if inventory_path is None:
             inventory_path = os.path.realpath(os.path.join(self.file_path, \
-                                              '..','inventory','multi_ec2.py'))
+                                              '..', '..', 'inventory', \
+                                              'multi_ec2.py'))
 
         if not os.path.isfile(inventory_path):
             raise Exception("Inventory file not found [%s]" % inventory_path)
diff --git a/bin/opssh b/bin/opssh
index d64096fd4..d8137fb20 100755
--- a/bin/opssh
+++ b/bin/opssh
@@ -2,7 +2,6 @@
 # vim: expandtab:tabstop=4:shiftwidth=4
 
 import argparse
-import awsutil
 import traceback
 import sys
 import os
@@ -12,6 +11,8 @@ import time
 import subprocess
 import ConfigParser
 
+from openshift_ansible import awsutil
+
 DEFAULT_PSSH_PAR = 200
 PSSH = '/usr/bin/pssh'
 CONFIG_MAIN_SECTION = 'main'
diff --git a/bin/oscp b/bin/oscp
index 011f37c7c..461ad0a0f 100755
--- a/bin/oscp
+++ b/bin/oscp
@@ -2,13 +2,14 @@
 # vim: expandtab:tabstop=4:shiftwidth=4
 
 import argparse
-import awsutil
 import traceback
 import sys
 import os
 import re
 import ConfigParser
 
+from openshift_ansible import awsutil
+
 CONFIG_MAIN_SECTION = 'main'
 CONFIG_INVENTORY_OPTION = 'inventory'
 
diff --git a/bin/ossh b/bin/ossh
index 134f4c46a..c16ea6eda 100755
--- a/bin/ossh
+++ b/bin/ossh
@@ -2,13 +2,14 @@
 # vim: expandtab:tabstop=4:shiftwidth=4
 
 import argparse
-import awsutil
 import traceback
 import sys
 import os
 import re
 import ConfigParser
 
+from openshift_ansible import awsutil
+
 CONFIG_MAIN_SECTION = 'main'
 CONFIG_INVENTORY_OPTION = 'inventory'