]> git.apps.os.sepia.ceph.com Git - ceph-cm-ansible.git/commitdiff
vmlist.py: Allow outputfile == None for list_nova too
authorDan Mick <dan.mick@redhat.com>
Fri, 8 May 2015 21:05:53 +0000 (14:05 -0700)
committerDan Mick <dan.mick@redhat.com>
Fri, 8 May 2015 21:07:06 +0000 (14:07 -0700)
Signed-off-by: Dan Mick <dan.mick@redhat.com>
tools/vmlist.py

index 19d45efdc33d73f2db00b315d906f4e48f7c5b9f..a1536c36dc2b7746ee14eaed4b2490f0cbcec6cd 100755 (executable)
@@ -118,6 +118,8 @@ def list_vms(host, outputfile):
 
 
 def list_nova(outputfile):
+    if outputfile is None:
+        outputfile = sys.stdout
     cloud_user = cfg.get('cloud_user')
     cloud_password = cfg.get('cloud_password')
     cloud_project = cfg.get('cloud_project')
@@ -134,7 +136,8 @@ def list_nova(outputfile):
         ]
         outputfile.writelines(output)
         outputfile.flush()
-        outputfile.seek(0)
+        if outputfile != sys.stdout:
+            outputfile.seek(0)
 
 
 usage = """