From 9c759fe8bf5fbabf1a9239d5aa27ed0f7a05258a Mon Sep 17 00:00:00 2001 From: James Bromberger Date: Tue, 8 Apr 2014 12:34:25 +0000 Subject: [PATCH] ASwitch manifests ot explicitly use Ec2 for metadata. Swap S3 to use a 4GB root FS. --- bootstrapvz/plugins/cloud_init/tasks.py | 4 +++- ...ec2-ebs-debian-official-amd64-hvm-cn-north-1.manifest.json | 3 +-- manifests/ec2-ebs-debian-official-amd64-hvm.manifest.json | 3 +-- ...ec2-ebs-debian-official-amd64-pvm-cn-north-1.manifest.json | 3 +-- manifests/ec2-ebs-debian-official-i386-pvm.manifest.json | 3 +-- manifests/ec2-ebs-debian-testing-amd64-pvm.manifest.json | 3 +-- manifests/ec2-ebs-debian-unstable-amd64-pvm.manifest.json | 3 +-- .../ec2-ebs-debian-unstable-contrib-amd64-pvm.manifest.json | 3 +-- .../ec2-s3-debian-official-amd64-pvm-cn-north-1.manifest.json | 2 +- manifests/ec2-s3.manifest.json | 2 +- 10 files changed, 12 insertions(+), 17 deletions(-) diff --git a/bootstrapvz/plugins/cloud_init/tasks.py b/bootstrapvz/plugins/cloud_init/tasks.py index 4e6b41d..dde46d6 100644 --- a/bootstrapvz/plugins/cloud_init/tasks.py +++ b/bootstrapvz/plugins/cloud_init/tasks.py @@ -52,7 +52,9 @@ class SetUsername(Task): class SetMetadataSource(Task): description = 'Setting metadata source' - phase = phases.system_modification + #phase = phases.system_modification + phase = phases.package_installation + successors = [apt.AptUpdate] @classmethod def run(cls, info): diff --git a/manifests/ec2-ebs-debian-official-amd64-hvm-cn-north-1.manifest.json b/manifests/ec2-ebs-debian-official-amd64-hvm-cn-north-1.manifest.json index afd55ba..622879e 100644 --- a/manifests/ec2-ebs-debian-official-amd64-hvm-cn-north-1.manifest.json +++ b/manifests/ec2-ebs-debian-official-amd64-hvm-cn-north-1.manifest.json @@ -37,8 +37,7 @@ "plugins": { "cloud_init": { "username": "admin", - //"metadata_sources": "Ec2", - "disable_modules": [ "landscape", "byobu", "ssh-import-id" ] + "metadata_sources": "Ec2" } } } diff --git a/manifests/ec2-ebs-debian-official-amd64-hvm.manifest.json b/manifests/ec2-ebs-debian-official-amd64-hvm.manifest.json index 93039ff..651d211 100644 --- a/manifests/ec2-ebs-debian-official-amd64-hvm.manifest.json +++ b/manifests/ec2-ebs-debian-official-amd64-hvm.manifest.json @@ -37,8 +37,7 @@ "plugins": { "cloud_init": { "username": "admin", - //"metadata_sources": "Ec2", - "disable_modules": [ "landscape", "byobu", "ssh-import-id" ] + "metadata_sources": "Ec2" } } } diff --git a/manifests/ec2-ebs-debian-official-amd64-pvm-cn-north-1.manifest.json b/manifests/ec2-ebs-debian-official-amd64-pvm-cn-north-1.manifest.json index 18dd022..4c88efb 100644 --- a/manifests/ec2-ebs-debian-official-amd64-pvm-cn-north-1.manifest.json +++ b/manifests/ec2-ebs-debian-official-amd64-pvm-cn-north-1.manifest.json @@ -37,8 +37,7 @@ "plugins": { "cloud_init": { "username": "admin", - //"metadata_sources": "Ec2", - "disable_modules": [ "landscape", "byobu", "ssh-import-id" ] + "metadata_sources": "Ec2" } } } diff --git a/manifests/ec2-ebs-debian-official-i386-pvm.manifest.json b/manifests/ec2-ebs-debian-official-i386-pvm.manifest.json index d68a6d2..b0a7db3 100644 --- a/manifests/ec2-ebs-debian-official-i386-pvm.manifest.json +++ b/manifests/ec2-ebs-debian-official-i386-pvm.manifest.json @@ -37,8 +37,7 @@ "plugins": { "cloud_init": { "username": "admin", - //"metadata_sources": "Ec2", - "disable_modules": [ "landscape", "byobu", "ssh-import-id" ] + "metadata_sources": "Ec2" } } } diff --git a/manifests/ec2-ebs-debian-testing-amd64-pvm.manifest.json b/manifests/ec2-ebs-debian-testing-amd64-pvm.manifest.json index 28c3826..0456892 100644 --- a/manifests/ec2-ebs-debian-testing-amd64-pvm.manifest.json +++ b/manifests/ec2-ebs-debian-testing-amd64-pvm.manifest.json @@ -37,8 +37,7 @@ "plugins": { "cloud_init": { "username": "admin", - //"metadata_sources": "Ec2", - "disable_modules": [ "landscape", "byobu", "ssh-import-id" ] + "metadata_sources": "Ec2" } } } diff --git a/manifests/ec2-ebs-debian-unstable-amd64-pvm.manifest.json b/manifests/ec2-ebs-debian-unstable-amd64-pvm.manifest.json index b9a4174..98e0f0a 100644 --- a/manifests/ec2-ebs-debian-unstable-amd64-pvm.manifest.json +++ b/manifests/ec2-ebs-debian-unstable-amd64-pvm.manifest.json @@ -37,8 +37,7 @@ "plugins": { "cloud_init": { "username": "admin", - //"metadata_sources": "Ec2", - "disable_modules": [ "landscape", "byobu", "ssh-import-id" ] + "metadata_sources": "Ec2" } } } diff --git a/manifests/ec2-ebs-debian-unstable-contrib-amd64-pvm.manifest.json b/manifests/ec2-ebs-debian-unstable-contrib-amd64-pvm.manifest.json index 61180df..eaf9584 100644 --- a/manifests/ec2-ebs-debian-unstable-contrib-amd64-pvm.manifest.json +++ b/manifests/ec2-ebs-debian-unstable-contrib-amd64-pvm.manifest.json @@ -38,8 +38,7 @@ "plugins": { "cloud_init": { "username": "admin", - //"metadata_sources": "Ec2", - "disable_modules": [ "landscape", "byobu", "ssh-import-id" ] + "metadata_sources": "Ec2" } } } diff --git a/manifests/ec2-s3-debian-official-amd64-pvm-cn-north-1.manifest.json b/manifests/ec2-s3-debian-official-amd64-pvm-cn-north-1.manifest.json index 57cf316..21acecb 100644 --- a/manifests/ec2-s3-debian-official-amd64-pvm-cn-north-1.manifest.json +++ b/manifests/ec2-s3-debian-official-amd64-pvm-cn-north-1.manifest.json @@ -33,7 +33,7 @@ "partitions": { "type": "none", "root": { - "size": "1GiB", + "size": "4GiB", "filesystem": "ext4" } } diff --git a/manifests/ec2-s3.manifest.json b/manifests/ec2-s3.manifest.json index 3351c90..f85f78b 100644 --- a/manifests/ec2-s3.manifest.json +++ b/manifests/ec2-s3.manifest.json @@ -33,7 +33,7 @@ "partitions": { "type": "none", "root": { - "size": "1GiB", + "size": "4GiB", "filesystem": "ext4" } }