From 76c940db37018cc056adf264a62d1a3185ef5017 Mon Sep 17 00:00:00 2001 From: Alex Adriaanse Date: Mon, 29 Jun 2015 23:25:02 +0000 Subject: [PATCH 1/3] Fix DKMS kernel version error This error is triggered when the kernel version installed into the image is different from the kernel version that's currently running. --- CHANGELOG.rst | 5 +++++ bootstrapvz/providers/ec2/tasks/network.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index f5d49c8..79728ea 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,11 @@ Changelog ========= +2015-06-29 +---------- +Alex Adriaanse: + * Fix DKMS kernel version error + 2015-05-08 ---------- Alexandre Derumier: diff --git a/bootstrapvz/providers/ec2/tasks/network.py b/bootstrapvz/providers/ec2/tasks/network.py index 4d247c5..b707600 100644 --- a/bootstrapvz/providers/ec2/tasks/network.py +++ b/bootstrapvz/providers/ec2/tasks/network.py @@ -64,4 +64,4 @@ AUTOINSTALL="yes" for task in ['add', 'build', 'install']: # Invoke DKMS task using specified kernel module (-m) and version (-v) log_check_call(['chroot', info.root, - 'dkms', task, '-m', 'ixgbevf', '-v', version]) + 'dkms', task, '-m', 'ixgbevf', '-v', version, '-k', info.kernel_version]) From 545a337a81da3a6a7762d36137bde38ea131ccd8 Mon Sep 17 00:00:00 2001 From: Alex Adriaanse Date: Tue, 30 Jun 2015 01:37:09 +0000 Subject: [PATCH 2/3] Add support for Btrfs --- CHANGELOG.rst | 1 + bootstrapvz/base/manifest-schema.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 79728ea..8ef6a87 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,7 @@ Changelog ---------- Alex Adriaanse: * Fix DKMS kernel version error + * Add support for Btrfs 2015-05-08 ---------- diff --git a/bootstrapvz/base/manifest-schema.yml b/bootstrapvz/base/manifest-schema.yml index ed4b3f0..c3f2bda 100644 --- a/bootstrapvz/base/manifest-schema.yml +++ b/bootstrapvz/base/manifest-schema.yml @@ -150,7 +150,7 @@ definitions: type: object properties: filesystem: - enum: [ext2, ext3, ext4, xfs] + enum: [ext2, ext3, ext4, xfs, btrfs] format_command: items: {type: string} minItems: 1 From 4954f9479000241113d127e3858a6479210c5c75 Mon Sep 17 00:00:00 2001 From: Alex Adriaanse Date: Mon, 29 Jun 2015 23:28:33 +0000 Subject: [PATCH 3/3] Add EC2 Jessie HVM manifest --- CHANGELOG.rst | 1 + .../official/ec2/ebs-jessie-amd64-hvm.yml | 33 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 manifests/official/ec2/ebs-jessie-amd64-hvm.yml diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 8ef6a87..69c50d1 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,6 +6,7 @@ Changelog Alex Adriaanse: * Fix DKMS kernel version error * Add support for Btrfs + * Add EC2 Jessie HVM manifest 2015-05-08 ---------- diff --git a/manifests/official/ec2/ebs-jessie-amd64-hvm.yml b/manifests/official/ec2/ebs-jessie-amd64-hvm.yml new file mode 100644 index 0000000..4343938 --- /dev/null +++ b/manifests/official/ec2/ebs-jessie-amd64-hvm.yml @@ -0,0 +1,33 @@ +--- +provider: + name: ec2 + virtualization: hvm + enhanced_networking: simple + # credentials: + # access-key: AFAKEACCESSKEYFORAWS + # secret-key: thes3cr3tkeyf0ryourawsaccount/FS4d8Qdva +bootstrapper: + workspace: /target +image: + name: debian-{system.release}-{system.architecture}-{provider.virtualization}-{%Y}-{%m}-{%d}-ebs + description: Debian {system.release} {system.architecture} +system: + release: jessie + architecture: amd64 + bootloader: extlinux + charmap: UTF-8 + locale: en_US + timezone: UTC +volume: + backing: ebs + partitions: + type: none + root: + filesystem: ext4 + size: 8GiB +packages: + mirror: http://cloudfront.debian.net/debian +plugins: + cloud_init: + metadata_sources: Ec2 + username: admin