diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2015-11-04 10:13:05 -0500 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2015-11-04 10:13:05 -0500 |
| commit | 9dff4e68bf1e40fac6b8e957f06a06b420a0e887 (patch) | |
| tree | 306735f0511870e1a45ddc7d5d78ba663bd166d4 /bin/ossh_zsh_completion | |
| parent | e275c1d17872f9727af3ac63ebae2d8a1b088649 (diff) | |
| parent | 4b85e4fae04a71cf2cea17018b9240b369f145d5 (diff) | |
| download | openshift-9dff4e68bf1e40fac6b8e957f06a06b420a0e887.tar.gz openshift-9dff4e68bf1e40fac6b8e957f06a06b420a0e887.tar.bz2 openshift-9dff4e68bf1e40fac6b8e957f06a06b420a0e887.tar.xz openshift-9dff4e68bf1e40fac6b8e957f06a06b420a0e887.zip | |
Merge pull request #793 from kwoodson/multiinventory
Renamed multi_ec2 to multi_inventory. Adding support for gce to mult_inventory.
Diffstat (limited to 'bin/ossh_zsh_completion')
| -rw-r--r-- | bin/ossh_zsh_completion | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bin/ossh_zsh_completion b/bin/ossh_zsh_completion index 44500c618..3c4018636 100644 --- a/bin/ossh_zsh_completion +++ b/bin/ossh_zsh_completion @@ -2,13 +2,13 @@ _ossh_known_hosts(){ if python -c 'import openshift_ansible' &>/dev/null; then - print $(/usr/bin/python -c 'from openshift_ansible import multi_ec2; m=multi_ec2.MultiEc2(); m.run(); z=m.result; print "\n".join(["%s.%s" % (host["ec2_tag_Name"],host["ec2_tag_environment"]) for dns, host in z["_meta"]["hostvars"].items() if all(k in host for k in ("ec2_tag_Name", "ec2_tag_environment"))])') + print $(/usr/bin/python -c 'from openshift_ansible import multi_inventory; m=multi_inventory.MultiInventory(); m.run(); z=m.result; print "\n".join(["%s.%s" % (host["ec2_tag_Name"],host["ec2_tag_environment"]) for dns, host in z["_meta"]["hostvars"].items() if all(k in host for k in ("ec2_tag_Name", "ec2_tag_environment"))])') - elif [[ -f /dev/shm/.ansible/tmp/multi_ec2_inventory.cache ]]; then - print $(/usr/bin/python -c 'import json; loc="/dev/shm/.ansible/tmp/multi_ec2_inventory.cache"; z=json.loads(open(loc).read()); print "\n".join(["%s.%s" % (host["ec2_tag_Name"],host["ec2_tag_environment"]) for dns, host in z["_meta"]["hostvars"].items() if all(k in host for k in ("ec2_tag_Name", "ec2_tag_environment"))])') + elif [[ -f /dev/shm/.ansible/tmp/multi_inventory.cache ]]; then + print $(/usr/bin/python -c 'import json; loc="/dev/shm/.ansible/tmp/multi_inventory.cache"; z=json.loads(open(loc).read()); print "\n".join(["%s.%s" % (host["ec2_tag_Name"],host["ec2_tag_environment"]) for dns, host in z["_meta"]["hostvars"].items() if all(k in host for k in ("ec2_tag_Name", "ec2_tag_environment"))])') - elif [[ -f ~/.ansible/tmp/multi_ec2_inventory.cache ]]; then - print $(/usr/bin/python -c 'import json,os; loc="%s" % os.path.expanduser("~/.ansible/tmp/multi_ec2_inventory.cache"); z=json.loads(open(loc).read()); print "\n".join(["%s.%s" % (host["ec2_tag_Name"],host["ec2_tag_environment"]) for dns, host in z["_meta"]["hostvars"].items() if all(k in host for k in ("ec2_tag_Name", "ec2_tag_environment"))])') + elif [[ -f ~/.ansible/tmp/multi_inventory.cache ]]; then + print $(/usr/bin/python -c 'import json,os; loc="%s" % os.path.expanduser("~/.ansible/tmp/multi_inventory.cache"); z=json.loads(open(loc).read()); print "\n".join(["%s.%s" % (host["ec2_tag_Name"],host["ec2_tag_environment"]) for dns, host in z["_meta"]["hostvars"].items() if all(k in host for k in ("ec2_tag_Name", "ec2_tag_environment"))])') fi |