diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2015-11-30 17:33:03 -0500 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2015-12-11 12:30:39 -0500 |
| commit | 7c945d07d2a61e7334a10388d37ac28f1bc58ce1 (patch) | |
| tree | d6a1c77f875ed11634aef0f79f476c2a5c7fa37c /bin/oscp | |
| parent | 5ad87a4592167142ec23058385b9bb96b594a12b (diff) | |
| download | openshift-7c945d07d2a61e7334a10388d37ac28f1bc58ce1.tar.gz openshift-7c945d07d2a61e7334a10388d37ac28f1bc58ce1.tar.bz2 openshift-7c945d07d2a61e7334a10388d37ac28f1bc58ce1.tar.xz openshift-7c945d07d2a61e7334a10388d37ac28f1bc58ce1.zip | |
Updating env-host-type to host patterns
Diffstat (limited to 'bin/oscp')
| -rwxr-xr-x | bin/oscp | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -138,7 +138,7 @@ class Oscp(object): # attempt to select the correct environment if specified if self.env: - results = filter(lambda result: result[1]['ec2_tag_environment'] == self.env, results) + results = filter(lambda result: result[1]['ec2_tag_env'] == self.env, results) if results: return results @@ -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:<18} {ec2_private_ip_address}'.format(**server_info) + print '{ec2_tag_Name:<35} {ec2_tag_env:<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:<8} {ec2_id:<15} {ec2_ip_address:<18} {ec2_private_ip_address}'.format(**server_info) + print '{ec2_tag_Name:<35} {ec2_tag_env:<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 @@ -209,7 +209,7 @@ class Oscp(object): if len(results) > 1: print "Multiple results found for %s." % self.host for result in results: - print "{ec2_tag_Name:<35} {ec2_tag_environment:<5} {ec2_id:<10}".format(**result[1]) + print "{ec2_tag_Name:<35} {ec2_tag_env:<5} {ec2_id:<10}".format(**result[1]) return # early exit, too many results # Assume we have one and only one. |