summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-04-10 11:33:25 -0400
committerThomas Wiest <twiest@users.noreply.github.com>2015-04-10 11:33:25 -0400
commitdd0f997a77fa88291bbd0ec3d59ba0ad369d9fec (patch)
tree5c5aad99026f1b1d289d0b5597fb5f596b4906c7 /bin
parent914b4c41d4a5f25f9ea850d21a50926148ae4bf1 (diff)
parent9fbec064d28a72963b1566258b4bcabcd63b2c23 (diff)
downloadopenshift-dd0f997a77fa88291bbd0ec3d59ba0ad369d9fec.tar.gz
openshift-dd0f997a77fa88291bbd0ec3d59ba0ad369d9fec.tar.bz2
openshift-dd0f997a77fa88291bbd0ec3d59ba0ad369d9fec.tar.xz
openshift-dd0f997a77fa88291bbd0ec3d59ba0ad369d9fec.zip
Merge pull request #141 from lhuard1A/virt
Add libvirt as a provider for openshift-ansible
Diffstat (limited to 'bin')
-rwxr-xr-xbin/cluster6
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/cluster b/bin/cluster
index 36ab1da1b..ca227721e 100755
--- a/bin/cluster
+++ b/bin/cluster
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
# vim: expandtab:tabstop=4:shiftwidth=4
import argparse
@@ -94,6 +94,8 @@ class Cluster(object):
os.environ[key] = config.get('ec2', key)
inventory = '-i inventory/aws/ec2.py'
+ elif 'libvirt' == provider:
+ inventory = '-i inventory/libvirt/hosts'
else:
# this code should never be reached
raise ValueError("invalid PROVIDER {}".format(provider))
@@ -139,7 +141,7 @@ if __name__ == '__main__':
cluster = Cluster()
- providers = ['gce', 'aws']
+ providers = ['gce', 'aws', 'libvirt']
parser = argparse.ArgumentParser(
description='Python wrapper to ensure proper environment for OpenShift ansible playbooks',
)