summaryrefslogtreecommitdiffstats
path: root/bin/oscp
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-03-13 23:24:36 -0400
committerThomas Wiest <twiest@users.noreply.github.com>2015-03-13 23:24:36 -0400
commitdb9cf8ef4f030f30391e021f360fe0c3db1dce74 (patch)
tree02eb2e2e32c060bf84fc022db9efc02d5e2a297d /bin/oscp
parentbaa950f64d4f1d76847f11cc6e136bff262c4de3 (diff)
parent35a8d1f73a54d468782547020975b79a77bffda2 (diff)
downloadopenshift-db9cf8ef4f030f30391e021f360fe0c3db1dce74.tar.gz
openshift-db9cf8ef4f030f30391e021f360fe0c3db1dce74.tar.bz2
openshift-db9cf8ef4f030f30391e021f360fe0c3db1dce74.tar.xz
openshift-db9cf8ef4f030f30391e021f360fe0c3db1dce74.zip
Merge pull request #114 from twiest/pr
Renamed AnsibleUtil to AwsUtil. Fixed bug in AwsUtil for hosts without environment set.
Diffstat (limited to 'bin/oscp')
-rwxr-xr-xbin/oscp8
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/oscp b/bin/oscp
index 1cc336a6a..146bbbea5 100755
--- a/bin/oscp
+++ b/bin/oscp
@@ -2,7 +2,7 @@
# vim: expandtab:tabstop=4:shiftwidth=4
import argparse
-import ansibleutil
+import awsutil
import traceback
import sys
import os
@@ -16,7 +16,7 @@ class Oscp(object):
# parse host and user
self.process_host()
- self.ansible = ansibleutil.AnsibleUtil()
+ self.aws = awsutil.AwsUtil()
# get a dict of host inventory
if self.args.list:
@@ -104,9 +104,9 @@ class Oscp(object):
dict['environment'] = [{'servername' : {}}, ]
'''
if cache_only:
- self.host_inventory = self.ansible.build_host_dict_by_env(['--cache-only'])
+ self.host_inventory = self.aws.build_host_dict_by_env(['--cache-only'])
else:
- self.host_inventory = self.ansible.build_host_dict_by_env()
+ self.host_inventory = self.aws.build_host_dict_by_env()
def select_host(self):
'''select host attempts to match the host specified