From d9b276629476dc2d6de3ef32717bf2035f4338c2 Mon Sep 17 00:00:00 2001
From: Kenny Woodson <kwoodson@redhat.com>
Date: Fri, 8 May 2015 15:00:31 -0400
Subject: Adding cache location for multi ec2
---
bin/oscp | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
(limited to 'bin/oscp')
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()
--
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/oscp | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
(limited to 'bin/oscp')
diff --git a/bin/oscp b/bin/oscp
index 68691ec22..f6dd2ad88 100755
--- a/bin/oscp
+++ b/bin/oscp
@@ -11,11 +11,9 @@ import ConfigParser
from openshift_ansible import awsutil
CONFIG_MAIN_SECTION = 'main'
-CONFIG_INVENTORY_OPTION = 'inventory'
class Oscp(object):
def __init__(self):
- self.inventory = None
self.file_path = os.path.join(os.path.dirname(os.path.realpath(__file__)))
# Default the config path to /etc
@@ -29,7 +27,7 @@ class Oscp(object):
# parse host and user
self.process_host()
- self.aws = awsutil.AwsUtil(self.inventory)
+ self.aws = awsutil.AwsUtil()
# get a dict of host inventory
if self.args.refresh_cache:
@@ -56,10 +54,6 @@ class Oscp(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)
-
def parse_cli_args(self):
parser = argparse.ArgumentParser(description='Openshift Online SSH Tool.')
parser.add_argument('-e', '--env',
--
cgit v1.2.3