From 6507ccbc0b78a2503fa28866731b21da96e65cf7 Mon Sep 17 00:00:00 2001
From: Marcin Kulisz <debian@kulisz.net>
Date: Sat, 21 Jan 2017 20:38:52 +0000
Subject: [PATCH] Adding boto3 to setup.py and minor lint fixes

---
 bootstrapvz/plugins/ec2_launch/tasks.py | 9 ++++-----
 setup.py                                | 1 +
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bootstrapvz/plugins/ec2_launch/tasks.py b/bootstrapvz/plugins/ec2_launch/tasks.py
index 20894bc..ec2d7b9 100644
--- a/bootstrapvz/plugins/ec2_launch/tasks.py
+++ b/bootstrapvz/plugins/ec2_launch/tasks.py
@@ -1,7 +1,7 @@
+import logging
 from bootstrapvz.base import Task
 from bootstrapvz.common import phases
 from bootstrapvz.providers.ec2.tasks import ami
-import logging
 
 
 # TODO: Merge with the method available in wip-integration-tests branch
@@ -29,7 +29,7 @@ class LaunchEC2Instance(Task):
                                SecurityGroupIds=info.manifest.plugins['ec2_launch'].get('security_group_ids'),
                                KeyName=info.manifest.plugins['ec2_launch'].get('ssh_key'),
                                InstanceType=info.manifest.plugins['ec2_launch'].get('instance_type',
-                                                                                     'm3.medium'))
+                                                                                    'm3.medium'))
         info._ec2['instance'] = r['Instances'][0]
 
         if 'tags' in info.manifest.plugins['ec2_launch']:
@@ -47,7 +47,6 @@ class PrintPublicIPAddress(Task):
 
     @classmethod
     def run(cls, info):
-        ec2 = info._ec2
         conn = info._ec2['connection']
         logger = logging.getLogger(__name__)
         filename = info.manifest.plugins['ec2_launch']['print_public_ip']
@@ -58,9 +57,9 @@ class PrintPublicIPAddress(Task):
         try:
             waiter = conn.get_waiter('instance_status_ok')
             waiter.wait(InstanceIds=[info._ec2['instance']['InstanceId']],
-                       Filters=[{'Name': 'instance-state-name', 'Values': ['running']}])
+                        Filters=[{'Name': 'instance-state-name', 'Values': ['running']}])
             info._ec2['instance'] = conn.describe_instances(InstanceIds=[info._ec2['instance']['InstanceId']])['Reservations'][0]['Instances'][0]
-            logger.info('******* EC2 IP ADDRESS: %s *******' % info._ec2['instance']['PublicIpAddress'] )
+            logger.info('******* EC2 IP ADDRESS: %s *******' % info._ec2['instance']['PublicIpAddress'])
             f.write(info._ec2['instance']['PublicIpAddress'])
         except:
             logger.error('Could not get IP address for the instance')
diff --git a/setup.py b/setup.py
index bffe5bf..5c3e05f 100644
--- a/setup.py
+++ b/setup.py
@@ -24,6 +24,7 @@ setup(name='bootstrap-vz',
                         'jsonschema >= 2.3.0',
                         'pyyaml >= 3.10',
                         'boto >= 2.14.0',
+                        'boto3 >= 1.4.2',
                         'docopt >= 0.6.1',
                         'pyrfc3339 >= 1.0',
                         'requests >= 2.4.3',