summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rwxr-xr-xbin/oscp14
-rwxr-xr-xbin/ossh15
2 files changed, 16 insertions, 13 deletions
diff --git a/bin/oscp b/bin/oscp
index 461ad0a0f..68691ec22 100755
--- a/bin/oscp
+++ b/bin/oscp
@@ -32,10 +32,10 @@ class Oscp(object):
self.aws = awsutil.AwsUtil(self.inventory)
# get a dict of host inventory
- if self.args.list:
- self.get_hosts()
- else:
+ if self.args.refresh_cache:
self.get_hosts(True)
+ else:
+ self.get_hosts()
if (self.args.src == '' or self.args.dest == '') and not self.args.list:
self.parser.print_help()
@@ -68,6 +68,8 @@ class Oscp(object):
action="store_true", help="debug mode")
parser.add_argument('-v', '--verbose', default=False,
action="store_true", help="Verbose?")
+ parser.add_argument('--refresh-cache', default=False,
+ action="store_true", help="Force a refresh on the host cache.")
parser.add_argument('--list', default=False,
action="store_true", help="list out hosts")
parser.add_argument('-r', '--recurse', action='store_true', default=False,
@@ -119,14 +121,14 @@ class Oscp(object):
else:
self.env = None
- def get_hosts(self, cache_only=False):
+ def get_hosts(self, refresh_cache=False):
'''Query our host inventory and return a dict where the format
equals:
dict['environment'] = [{'servername' : {}}, ]
'''
- if cache_only:
- self.host_inventory = self.aws.build_host_dict_by_env(['--cache-only'])
+ if refresh_cache:
+ self.host_inventory = self.aws.build_host_dict_by_env(['--refresh-cache'])
else:
self.host_inventory = self.aws.build_host_dict_by_env()
diff --git a/bin/ossh b/bin/ossh
index c16ea6eda..196430e13 100755
--- a/bin/ossh
+++ b/bin/ossh
@@ -28,11 +28,10 @@ class Ossh(object):
self.aws = awsutil.AwsUtil(self.inventory)
- # get a dict of host inventory
- if self.args.list:
- self.get_hosts()
- else:
+ if self.args.refresh_cache:
self.get_hosts(True)
+ else:
+ self.get_hosts()
# parse host and user
self.process_host()
@@ -67,6 +66,8 @@ class Ossh(object):
action="store_true", help="debug mode")
parser.add_argument('-v', '--verbose', default=False,
action="store_true", help="Verbose?")
+ parser.add_argument('--refresh-cache', default=False,
+ action="store_true", help="Force a refresh on the host cache.")
parser.add_argument('--list', default=False,
action="store_true", help="list out hosts")
parser.add_argument('-c', '--command', action='store',
@@ -109,14 +110,14 @@ class Ossh(object):
if self.args.login_name:
self.user = self.args.login_name
- def get_hosts(self, cache_only=False):
+ def get_hosts(self, refresh_cache=False):
'''Query our host inventory and return a dict where the format
equals:
dict['servername'] = dns_name
'''
- if cache_only:
- self.host_inventory = self.aws.build_host_dict_by_env(['--cache-only'])
+ if refresh_cache:
+ self.host_inventory = self.aws.build_host_dict_by_env(['--refresh-cache'])
else:
self.host_inventory = self.aws.build_host_dict_by_env()