From 273b5e0183f8676a2fe977fb437b585024525916 Mon Sep 17 00:00:00 2001
From: Anders Ingemann <anders@ingemann.de>
Date: Fri, 9 Dec 2016 08:38:34 +0100
Subject: [PATCH 1/2] Fix linting error in file_copy plugin

---
 bootstrapvz/plugins/file_copy/tasks.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/bootstrapvz/plugins/file_copy/tasks.py b/bootstrapvz/plugins/file_copy/tasks.py
index 89345a8..484bdab 100644
--- a/bootstrapvz/plugins/file_copy/tasks.py
+++ b/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)

From 441786e8e1ec3d2fbf278d1abc7a5122c333b7a6 Mon Sep 17 00:00:00 2001
From: Peter Wagner <git@mycloudand.me>
Date: Thu, 8 Dec 2016 17:24:45 -0800
Subject: [PATCH 2/2] Support ca-central-1

AMI? More like eh-MI
---
 bootstrapvz/plugins/ec2_publish/manifest-schema.yml | 3 ++-
 bootstrapvz/providers/ec2/manifest-schema-s3.yml    | 1 +
 bootstrapvz/providers/ec2/tasks/ami-akis.yml        | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/bootstrapvz/plugins/ec2_publish/manifest-schema.yml b/bootstrapvz/plugins/ec2_publish/manifest-schema.yml
index 236d21e..29c0a53 100644
--- a/bootstrapvz/plugins/ec2_publish/manifest-schema.yml
+++ b/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
\ No newline at end of file
+    - cn-north-1
diff --git a/bootstrapvz/providers/ec2/manifest-schema-s3.yml b/bootstrapvz/providers/ec2/manifest-schema-s3.yml
index a9c7f63..0b63ef1 100644
--- a/bootstrapvz/providers/ec2/manifest-schema-s3.yml
+++ b/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
diff --git a/bootstrapvz/providers/ec2/tasks/ami-akis.yml b/bootstrapvz/providers/ec2/tasks/ami-akis.yml
index 135a389..113cae3 100644
--- a/bootstrapvz/providers/ec2/tasks/ami-akis.yml
+++ b/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