Commit graph

60 commits

Author SHA1 Message Date
Anders Ingemann
f50a8e66ce Merge branch 'master' into development
Conflicts:
	.gitignore
	bootstrapvz/common/tasks/apt.py
	bootstrapvz/plugins/cloud_init/__init__.py
	bootstrapvz/plugins/cloud_init/tasks.py
	tox.ini
2014-05-08 23:00:54 +02:00
Anders Ingemann
f3d633780f Use string concatenation instead of format()
String concatenation can at times be easier to read that format().
One should choose whichever approach is more readable.
2014-05-04 13:41:15 +02:00
Anders Ingemann
d5efec8885 Add ssh_group, which configures SSH properly 2014-05-03 16:13:07 +02:00
Anders Ingemann
056f1968c1 Fixes #14 and #78
S3 images can now be bootstrapped outside EC2.
However, this fix adds the requirement of a "region" setting.
At some point we could make "region" optional and fail when bootstrap-vz
is run outside EC2 and no "region" is set.
2014-05-03 16:12:34 +02:00
Tomasz Rybak
f8dd196e59 Add missing unstable configuration fixing EC2 image building problems. 2014-04-22 20:09:47 +02:00
Anders Ingemann
3b23ccf92c Don't use DictClass for provider namespaces
It's a hack only for the manifest vars and shouldn't be used for anything else
2014-04-10 00:20:35 +02:00
Anders Ingemann
9e748601b3 Use bootstrapinfo module namespace when applicable 2014-04-08 23:12:08 +02:00
James Bromberger
334ef9209b Merge remote-tracking branch 'upstream/master'
Conflicts:
	bootstrapvz/common/tasks/apt.py
2014-04-05 09:38:21 +00:00
Anders Ingemann
bbb06d717e Properly fix imports and make bootstrapvz work like a package 2014-04-02 21:32:10 +02:00
Anders Ingemann
be96e4c13f Move code into proper package folder 2014-04-02 21:26:13 +02:00