summaryrefslogtreecommitdiffstats
path: root/bin/ohi
diff options
context:
space:
mode:
authorTroy Dawson <tdawson@redhat.com>2015-05-21 14:11:25 -0500
committerTroy Dawson <tdawson@redhat.com>2015-05-21 14:11:25 -0500
commit124ca40c134a40b2e6823ab3c4bfe329580d7eaa (patch)
tree6cbc6c67bcefea2ed964c4fbda0aa47c3a2b067c /bin/ohi
parent803b9191f1a3a2bffe94528a8a5cd82adf6f3a42 (diff)
parentc3bd6a3489dd0473334543024efa2c3c96ba8be2 (diff)
downloadopenshift-124ca40c134a40b2e6823ab3c4bfe329580d7eaa.tar.gz
openshift-124ca40c134a40b2e6823ab3c4bfe329580d7eaa.tar.bz2
openshift-124ca40c134a40b2e6823ab3c4bfe329580d7eaa.tar.xz
openshift-124ca40c134a40b2e6823ab3c4bfe329580d7eaa.zip
Merge branch 'int' into stg
Diffstat (limited to 'bin/ohi')
-rwxr-xr-xbin/ohi13
1 files changed, 3 insertions, 10 deletions
diff --git a/bin/ohi b/bin/ohi
index bb52166df..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:
@@ -47,12 +44,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:
@@ -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):