summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-03-30 17:50:08 -0400
committerThomas Wiest <twiest@users.noreply.github.com>2015-03-30 17:50:08 -0400
commit4665eaefa2ae5c734da282869b53ed234f69d311 (patch)
tree73152042f29406e20a6dd41c0b83f8f34c7b8681
parent1ba0619575f23e880d431ec2a15b9c02bfc5e3a9 (diff)
parent24ce165d9ca662f9a0438e658197ff41fd02ae03 (diff)
downloadopenshift-4665eaefa2ae5c734da282869b53ed234f69d311.tar.gz
openshift-4665eaefa2ae5c734da282869b53ed234f69d311.tar.bz2
openshift-4665eaefa2ae5c734da282869b53ed234f69d311.tar.xz
openshift-4665eaefa2ae5c734da282869b53ed234f69d311.zip
Merge pull request #127 from twiest/pr
created a python package named openshift_ansible
-rw-r--r--bin/openshift-ansible-bin.spec2
-rw-r--r--bin/openshift_ansible/__init__.py0
-rw-r--r--bin/openshift_ansible/awsutil.py (renamed from bin/awsutil.py)3
-rwxr-xr-xbin/opssh3
-rwxr-xr-xbin/oscp3
-rwxr-xr-xbin/ossh3
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'