summaryrefslogtreecommitdiffstats
path: root/bin/openshift_ansible/awsutil.py
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2015-11-02 16:03:33 -0500
committerKenny Woodson <kwoodson@redhat.com>2015-11-03 16:57:22 -0500
commit4b85e4fae04a71cf2cea17018b9240b369f145d5 (patch)
tree6b917d6f4d0e84a49e10f9eaa3ca70efc8e3a106 /bin/openshift_ansible/awsutil.py
parenta4d5e59c413746cb1715b15a9e158be3f3a94a54 (diff)
downloadopenshift-4b85e4fae04a71cf2cea17018b9240b369f145d5.tar.gz
openshift-4b85e4fae04a71cf2cea17018b9240b369f145d5.tar.bz2
openshift-4b85e4fae04a71cf2cea17018b9240b369f145d5.tar.xz
openshift-4b85e4fae04a71cf2cea17018b9240b369f145d5.zip
Support for gce
Diffstat (limited to 'bin/openshift_ansible/awsutil.py')
-rw-r--r--bin/openshift_ansible/awsutil.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/bin/openshift_ansible/awsutil.py b/bin/openshift_ansible/awsutil.py
index 9df034f57..45345007c 100644
--- a/bin/openshift_ansible/awsutil.py
+++ b/bin/openshift_ansible/awsutil.py
@@ -4,7 +4,10 @@
import os
import re
-from openshift_ansible import multi_ec2
+
+# Buildbot does not have multi_inventory installed
+#pylint: disable=no-name-in-module
+from openshift_ansible import multi_inventory
class ArgumentError(Exception):
"""This class is raised when improper arguments are passed."""
@@ -49,9 +52,9 @@ class AwsUtil(object):
Keyword arguments:
args -- optional arguments to pass to the inventory script
"""
- mec2 = multi_ec2.MultiEc2(args)
- mec2.run()
- return mec2.result
+ minv = multi_inventory.MultiInventory(args)
+ minv.run()
+ return minv.result
def get_environments(self):
"""Searches for env tags in the inventory and returns all of the envs found."""