summaryrefslogtreecommitdiffstats
path: root/bin/ohi
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/ohi
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/ohi')
-rwxr-xr-xbin/ohi9
1 files changed, 1 insertions, 8 deletions
diff --git a/bin/ohi b/bin/ohi
index 24a027be2..6f162ac13 100755
--- a/bin/ohi
+++ b/bin/ohi
@@ -17,13 +17,10 @@ from openshift_ansible.awsutil import ArgumentError
CONFIG_MAIN_SECTION = 'main'
CONFIG_HOST_TYPE_ALIAS_SECTION = 'host_type_aliases'
-CONFIG_INVENTORY_OPTION = 'inventory'
-
class Ohi(object):
def __init__(self):
- self.inventory = None
self.host_type_aliases = {}
self.file_path = os.path.join(os.path.dirname(os.path.realpath(__file__)))
@@ -35,7 +32,7 @@ class Ohi(object):
self.parse_cli_args()
self.parse_config_file()
- self.aws = awsutil.AwsUtil(self.inventory, self.host_type_aliases)
+ self.aws = awsutil.AwsUtil(self.host_type_aliases)
def run(self):
if self.args.list_host_types:
@@ -76,10 +73,6 @@ class Ohi(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)
-
self.host_type_aliases = {}
if config.has_section(CONFIG_HOST_TYPE_ALIAS_SECTION):
for alias in config.options(CONFIG_HOST_TYPE_ALIAS_SECTION):