kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-24 15:36:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1 from andsens/master

Browse source 
Need to have latest commits
This commit is contained in:
n3ph 2016-12-10 19:08:17 +01:00 • committed by GitHub
commit 7f2202fdcf
4 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bootstrapvz/plugins/ec2_publish/manifest-schema.yml
View file

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

5
bootstrapvz/plugins/file_copy/tasks.py
View file

@ -69,9 +69,4 @@ class FileCopyCommand(Task):
else: else:
shutil.copytree(src_path, final_destination) 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) modify_path(info, file_entry['dst'], file_entry)

1
bootstrapvz/providers/ec2/manifest-schema-s3.yml
View file

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

2
bootstrapvz/providers/ec2/tasks/ami-akis.yml
View file

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