From c28d4ec46ff9152ae5c91837cc29423805af6bf3 Mon Sep 17 00:00:00 2001
From: Thomas Wiest <twiest@redhat.com>
Date: Wed, 6 May 2015 16:17:13 -0400
Subject: added '-e all' to ohi and fixed pylint errors.

---
 bin/ohi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'bin/ohi')

diff --git a/bin/ohi b/bin/ohi
index bb52166df..24a027be2 100755
--- a/bin/ohi
+++ b/bin/ohi
@@ -47,12 +47,12 @@ class Ohi(object):
            self.args.env is not None:
             # Both env and host-type specified
             hosts = self.aws.get_host_list(host_type=self.args.host_type, \
-                                           env=self.args.env)
+                                           envs=self.args.env)
 
         if self.args.host_type is None and \
            self.args.env is not None:
             # Only env specified
-            hosts = self.aws.get_host_list(env=self.args.env)
+            hosts = self.aws.get_host_list(envs=self.args.env)
 
         if self.args.host_type is not None and \
            self.args.env is None:
-- 
cgit v1.2.3


From 88c7ed4ad437f6705d91e4c1ffb2e88c71fb7db4 Mon Sep 17 00:00:00 2001
From: Kenny Woodson <kwoodson@redhat.com>
Date: Thu, 14 May 2015 16:41:10 -0400
Subject: Command line tools import multi_ec2 as lib

---
 bin/ohi | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'bin/ohi')

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):
-- 
cgit v1.2.3