diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2015-08-17 11:07:14 -0400 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2015-08-17 11:07:14 -0400 |
| commit | 4cbc4eeba205ad923aa58facc8c82344f0be0938 (patch) | |
| tree | 1b19afab1a00e49724c9dfe24ad5759ca9899840 | |
| parent | f96e82f627b63bf0449eecdd21f85a29ad4210e8 (diff) | |
| parent | de1b53a67d22e2e2e5fa833992d1337d49792507 (diff) | |
| download | openshift-4cbc4eeba205ad923aa58facc8c82344f0be0938.tar.gz openshift-4cbc4eeba205ad923aa58facc8c82344f0be0938.tar.bz2 openshift-4cbc4eeba205ad923aa58facc8c82344f0be0938.tar.xz openshift-4cbc4eeba205ad923aa58facc8c82344f0be0938.zip | |
Merge pull request #468 from kwoodson/temp
List also private ip.
| -rwxr-xr-x | bin/oscp | 4 | ||||
| -rwxr-xr-x | bin/ossh | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -167,7 +167,7 @@ class Oscp(object): name = server_info['ec2_tag_Name'] ec2_id = server_info['ec2_id'] ip = server_info['ec2_ip_address'] - print '{ec2_tag_Name:<35} {ec2_tag_environment:<8} {ec2_id:<15} {ec2_ip_address}'.format(**server_info) + print '{ec2_tag_Name:<35} {ec2_tag_environment:<8} {ec2_id:<15} {ec2_ip_address:<18} {ec2_private_ip_address}'.format(**server_info) if limit: print @@ -180,7 +180,7 @@ class Oscp(object): name = server_info['ec2_tag_Name'] ec2_id = server_info['ec2_id'] ip = server_info['ec2_ip_address'] - print '{ec2_tag_Name:<35} {ec2_tag_environment:<5} {ec2_id:<15} {ec2_ip_address}'.format(**server_info) + print '{ec2_tag_Name:<35} {ec2_tag_environment:<8} {ec2_id:<15} {ec2_ip_address:<18} {ec2_private_ip_address}'.format(**server_info) def scp(self): '''scp files to or from a specified host @@ -156,7 +156,7 @@ class Ossh(object): name = server_info['ec2_tag_Name'] ec2_id = server_info['ec2_id'] ip = server_info['ec2_ip_address'] - print '{ec2_tag_Name:<35} {ec2_tag_environment:<8} {ec2_id:<15} {ec2_ip_address}'.format(**server_info) + print '{ec2_tag_Name:<35} {ec2_tag_environment:<8} {ec2_id:<15} {ec2_ip_address:<18} {ec2_private_ip_address}'.format(**server_info) if limit: print @@ -169,7 +169,7 @@ class Ossh(object): name = server_info['ec2_tag_Name'] ec2_id = server_info['ec2_id'] ip = server_info['ec2_ip_address'] - print '{ec2_tag_Name:<35} {ec2_tag_environment:<5} {ec2_id:<15} {ec2_ip_address}'.format(**server_info) + print '{ec2_tag_Name:<35} {ec2_tag_environment:<8} {ec2_id:<15} {ec2_ip_address:<18} {ec2_private_ip_address}'.format(**server_info) def ssh(self): '''SSH to a specified host |