Merge pull request #1 from andsens/master

Need to have latest commits

bootstrapvz/plugins/ec2_publish/manifest-schema.yml

@@ -23,6 +23,7 @@ definitions:
     - ap-northeast-2
     - ap-southeast-1
     - ap-southeast-2
+    - ca-central-1
     - eu-central-1
     - eu-west-1
     - sa-east-1
@@ -30,4 +31,4 @@ definitions:
     - us-gov-west-1
     - us-west-1
     - us-west-2
-    - cn-north-1
+    - cn-north-1

bootstrapvz/plugins/file_copy/tasks.py

@@ -69,9 +69,4 @@ class FileCopyCommand(Task):
             else:
                 shutil.copytree(src_path, final_destination)
 
-            if os.path.isfile(src_path) and os.path.isdir(final_destination):
-                dst = os.path.join(final_destination, os.path.basename(src_path))
-            else:
-                dst = final_destination
-
             modify_path(info, file_entry['dst'], file_entry)

bootstrapvz/providers/ec2/manifest-schema-s3.yml

@@ -26,6 +26,7 @@ definitions:
     - ap-northeast-2
     - ap-southeast-1
     - ap-southeast-2
+    - ca-central-1
     - eu-central-1
     - eu-west-1
     - sa-east-1

bootstrapvz/providers/ec2/tasks/ami-akis.yml

@@ -34,3 +34,5 @@ us-west-2:
 cn-north-1:
   amd64: aki-9e8f1da7
   i386: aki-908f1da9
+ca-central-1:
+  amd64: aki-320ebd56