summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2015-08-17 11:07:14 -0400
committerKenny Woodson <kwoodson@redhat.com>2015-08-17 11:07:14 -0400
commit4cbc4eeba205ad923aa58facc8c82344f0be0938 (patch)
tree1b19afab1a00e49724c9dfe24ad5759ca9899840 /bin
parentf96e82f627b63bf0449eecdd21f85a29ad4210e8 (diff)
parentde1b53a67d22e2e2e5fa833992d1337d49792507 (diff)
downloadopenshift-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.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/oscp4
-rwxr-xr-xbin/ossh4
2 files changed, 4 insertions, 4 deletions
diff --git a/bin/oscp b/bin/oscp
index 91fc45cd3..89e90a36a 100755
--- a/bin/oscp
+++ b/bin/oscp
@@ -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
diff --git a/bin/ossh b/bin/ossh
index 2ed033305..b6738ee76 100755
--- a/bin/ossh
+++ b/bin/ossh
@@ -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