Merge pull request #2772 from lwade/ec2_volattr

Corrected instance password data check. Previously broken after adding ...

Merge pull request #2772 from lwade/ec2_volattr
Corrected instance password data check. Previously broken after adding ...
fd2840c0 · Michael DeHaan · a63af4fa · 6a7a8cda · fd2840c0
Commit fd2840c0 authored Apr 24, 2013 by Michael DeHaan
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

library/ec2_vol
+1 -1

No files found.
--- a/library/ec2_vol
+++ b/library/ec2_vol
@@ -176,7 +176,7 @@ def main():

    if device_name is None and instance:
        try:
-            if inst.get_password_data == '':
+            if not ec2.get_password_data(inst.id):
                device_name = '/dev/sdf'
                attach = volume.attach(inst.id, device_name)
                while volume.attachment_state() != 'attached':