summaryrefslogtreecommitdiffstats
path: root/bin/ohi
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-04-10 17:47:37 -0400
committerThomas Wiest <twiest@users.noreply.github.com>2015-04-10 17:47:37 -0400
commit874d7e26c3e25434fab2346e6b3f5548848889db (patch)
tree7344b44bd61d246ec1957b106521b8e149452c11 /bin/ohi
parentb05d0890a77ba47f1172bffe0fc15cf33e69578b (diff)
parent8a7a455abfcf8df7ddc706d11167cb904e1b52dd (diff)
downloadopenshift-874d7e26c3e25434fab2346e6b3f5548848889db.tar.gz
openshift-874d7e26c3e25434fab2346e6b3f5548848889db.tar.bz2
openshift-874d7e26c3e25434fab2346e6b3f5548848889db.tar.xz
openshift-874d7e26c3e25434fab2346e6b3f5548848889db.zip
Merge pull request #151 from twiest/pr
added the ability to run opssh and ohi on all hosts in an environment, as well as all hosts of the same host-type regardless of environment
Diffstat (limited to 'bin/ohi')
-rwxr-xr-xbin/ohi36
1 files changed, 25 insertions, 11 deletions
diff --git a/bin/ohi b/bin/ohi
index 06a375cdb..408961ee4 100755
--- a/bin/ohi
+++ b/bin/ohi
@@ -12,13 +12,12 @@ import subprocess
import ConfigParser
from openshift_ansible import awsutil
+from openshift_ansible.awsutil import ArgumentError
CONFIG_MAIN_SECTION = 'main'
CONFIG_HOST_TYPE_ALIAS_SECTION = 'host_type_aliases'
CONFIG_INVENTORY_OPTION = 'inventory'
-class ArgumentMismatchError(ValueError): pass
-
class Ohi(object):
def __init__(self):
self.inventory = None
@@ -40,15 +39,30 @@ class Ohi(object):
self.aws.print_host_types()
return 0
- if self.args.env and \
- self.args.host_type:
- hosts = self.aws.get_host_list(self.args.host_type, self.args.env)
- for host in hosts:
- print host
- return 0
+ hosts = None
+ if self.args.host_type is not None and \
+ 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)
+
+ 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)
+
+ if self.args.host_type is not None and \
+ self.args.env is None:
+ # Only host-type specified
+ hosts = self.aws.get_host_list(host_type=self.args.host_type)
+
+ if hosts is None:
+ # We weren't able to determine what they wanted to do
+ raise ArgumentError("Invalid combination of arguments")
- # If it makes it here, we weren't able to determine what they wanted to do
- raise ArgumentMismatchError("Invalid combination of arguments")
+ for host in hosts:
+ print host
+ return 0
def parse_config_file(self):
if os.path.isfile(self.config_path):
@@ -92,5 +106,5 @@ if __name__ == '__main__':
ohi = Ohi()
exitcode = ohi.run()
sys.exit(exitcode)
- except ArgumentMismatchError as e:
+ except ArgumentError as e:
print "\nError: %s\n" % e.message