summaryrefslogtreecommitdiffstats
path: root/bin/oscp
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2015-05-14 17:19:55 -0400
committerKenny Woodson <kwoodson@redhat.com>2015-05-14 17:19:55 -0400
commit3f97a57f0c862976b4fd1570eb00c22c8484c137 (patch)
tree8e0e0f28c9614c154da597adf572fd7ab0e97cda /bin/oscp
parentff96174e119f0b176580249ec2d022b46b63e074 (diff)
parent88c7ed4ad437f6705d91e4c1ffb2e88c71fb7db4 (diff)
downloadopenshift-3f97a57f0c862976b4fd1570eb00c22c8484c137.tar.gz
openshift-3f97a57f0c862976b4fd1570eb00c22c8484c137.tar.bz2
openshift-3f97a57f0c862976b4fd1570eb00c22c8484c137.tar.xz
openshift-3f97a57f0c862976b4fd1570eb00c22c8484c137.zip
Merge pull request #227 from kwoodson/ec2_library
Update to call multi_ec2 as library for command line tools.
Diffstat (limited to 'bin/oscp')
-rwxr-xr-xbin/oscp8
1 files changed, 1 insertions, 7 deletions
diff --git a/bin/oscp b/bin/oscp
index 68691ec22..f6dd2ad88 100755
--- a/bin/oscp
+++ b/bin/oscp
@@ -11,11 +11,9 @@ import ConfigParser
from openshift_ansible import awsutil
CONFIG_MAIN_SECTION = 'main'
-CONFIG_INVENTORY_OPTION = 'inventory'
class Oscp(object):
def __init__(self):
- self.inventory = None
self.file_path = os.path.join(os.path.dirname(os.path.realpath(__file__)))
# Default the config path to /etc
@@ -29,7 +27,7 @@ class Oscp(object):
# parse host and user
self.process_host()
- self.aws = awsutil.AwsUtil(self.inventory)
+ self.aws = awsutil.AwsUtil()
# get a dict of host inventory
if self.args.refresh_cache:
@@ -56,10 +54,6 @@ class Oscp(object):
config = ConfigParser.ConfigParser()
config.read(self.config_path)
- if config.has_section(CONFIG_MAIN_SECTION) and \
- config.has_option(CONFIG_MAIN_SECTION, CONFIG_INVENTORY_OPTION):
- self.inventory = config.get(CONFIG_MAIN_SECTION, CONFIG_INVENTORY_OPTION)
-
def parse_cli_args(self):
parser = argparse.ArgumentParser(description='Openshift Online SSH Tool.')
parser.add_argument('-e', '--env',