Merge pull request #88 from JamesBromberger/python

fix ec2 manifest and import
This commit is contained in:
Anders Ingemann 2013-08-13 07:47:22 -07:00
commit 3af49a8e88
2 changed files with 3 additions and 2 deletions

View file

@ -8,6 +8,7 @@
"bootstrapper": { "bootstrapper": {
"mount_dir": "/target" "mount_dir": "/target"
"mirror": "http://http.debian.net/"
}, },
"image": { "image": {
"name": "debian-{release}-{architecture}-{virtualization}-{%y}{%m}{%d}", "name": "debian-{release}-{architecture}-{virtualization}-{%y}{%m}{%d}",
@ -23,7 +24,7 @@
"volume": { "volume": {
"backing": "ebs", "backing": "ebs",
"filesystem": "ext4", "filesystem": "ext4",
"size": 1024 "size": 8192
}, },
"plugins": { "plugins": {
"admin_user": { "admin_user": {

View file

@ -1,7 +1,7 @@
from base import Task from base import Task
from common import phases from common import phases
from common.exceptions import TaskError from common.exceptions import TaskError
from filesystem import UnmountVolume from common.tasks.filesystem import UnmountVolume
import time import time