Merge pull request #1762 from edx/feanil/fix_abey

Fix the thing.

util/vpc-tools/abbey.py

@@ -380,9 +380,10 @@ rm -rf $base_dir
                 secure_vars_file=secure_vars_file,
                 cache_id=args.cache_id)
 
-    mapping = BlockDeviceMapping(delete_on_termination=True,
-                                 volume_type='gp2')
-    root_vol = BlockDeviceType(size=args.root_vol_size)
+    mapping = BlockDeviceMapping()
+    root_vol = BlockDeviceType(size=args.root_vol_size,
+                               delete_on_termination=True,
+                               volume_type='gp2')
     mapping['/dev/sda1'] = root_vol
 
     ec2_args = {