Home Explore Help
Register Sign In
shixiong
/
okd
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Updated to show private ips when doing a list

Kenny Woodson 9 years ago
parent
cd989f6270
commit
de1b53a67d
2 changed files with 4 additions and 4 deletions
Split View Show Diff Stats
  1. 2 2
      bin/oscp
  2. 2 2
      bin/ossh

+ 2 - 2
bin/oscp
View File 

@@ -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

+ 2 - 2
bin/ossh
View File 

@@ -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