diff options
author | Kenny Woodson <kwoodson@redhat.com> | 2015-08-12 09:37:11 -0400 |
---|---|---|
committer | Kenny Woodson <kwoodson@redhat.com> | 2015-08-12 11:51:38 -0400 |
commit | 95161235972ec14fa7b2e10bc0ab21f5cce65db8 (patch) | |
tree | 73e1e53c9d19f214db421f0cd1aaf18304ef1509 /bin/ossh_zsh_completion | |
parent | f0cec74c0bdcbdec69f148a5fa4b9a9985df5253 (diff) | |
download | openshift-95161235972ec14fa7b2e10bc0ab21f5cce65db8.tar.gz openshift-95161235972ec14fa7b2e10bc0ab21f5cce65db8.tar.bz2 openshift-95161235972ec14fa7b2e10bc0ab21f5cce65db8.tar.xz openshift-95161235972ec14fa7b2e10bc0ab21f5cce65db8.zip |
Updated to read config first and default to users home dir
Diffstat (limited to 'bin/ossh_zsh_completion')
-rw-r--r-- | bin/ossh_zsh_completion | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/bin/ossh_zsh_completion b/bin/ossh_zsh_completion index 6ab930dc4..44500c618 100644 --- a/bin/ossh_zsh_completion +++ b/bin/ossh_zsh_completion @@ -1,9 +1,16 @@ #compdef ossh oscp _ossh_known_hosts(){ - if [[ -f ~/.ansible/tmp/multi_ec2_inventory.cache ]]; then - print $(/usr/bin/python -c 'import json,os; z = json.loads(open("%s"%os.path.expanduser("~/.ansible/tmp/multi_ec2_inventory.cache")).read()); print "\n".join(["%s.%s" % (host["ec2_tag_Name"],host["ec2_tag_environment"]) for dns, host in z["_meta"]["hostvars"].items()])') - fi + 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"))])') + + 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 ~/.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"))])') + + fi } _ossh(){ |