Skip to content

Commit

Permalink
AWS: Update jessie image, to fix reboot issue
Browse files Browse the repository at this point in the history
The previous jessie image had a broken cloud-init, which would use an
Ubuntu-specific 'nobootwait' argument when mounting disks.  We now
override that in the image.

Fix #22549
  • Loading branch information
justinsb committed Mar 5, 2016
1 parent 6d9e0ed commit 0d8d63c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion cluster/aws/jessie/util.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function detect-jessie-image () {
aws_account="721322707521"
# TODO: we could use tags for the image
if [[ -z "${AWS_IMAGE_NAME:-}" ]]; then
AWS_IMAGE_NAME="k8s-1.2-debian-jessie-amd64-hvm-2016-02-24-ebs"
AWS_IMAGE_NAME="k8s-1.2-debian-jessie-amd64-hvm-2016-03-05-ebs"
fi
AWS_IMAGE=`aws ec2 describe-images --owner ${aws_account} --filters Name=name,Values=${AWS_IMAGE_NAME} --query Images[].ImageId --output text`
if [[ -z "${AWS_IMAGE-}" ]]; then
Expand Down
4 changes: 4 additions & 0 deletions cluster/cloudimages/k8s-ebs-jessie-amd64-hvm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,10 @@ plugins:
- [ 'chroot', '{root}', '/bin/sh', '-c', 'DEBIAN_FRONTEND=noninteractive dpkg --install /tmp/docker.deb' ]
- [ 'rm', '{root}/tmp/docker.deb' ]

# Fix a cloud-init bug where it uses nobootwait
# see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=789884
- [ 'chroot', '{root}', '/bin/sh', '-c', 'echo "mount_default_fields: [~, ~, ''auto'', ''defaults,nofail'', ''0'', ''2'']" > /etc/cloud/cloud.cfg.d/99_kubernetes.cfg' ]

# We perform a full replacement of some grub conf variables:
# GRUB_CMDLINE_LINUX_DEFAULT (add memory cgroup)
# GRUB_TIMEOUT (remove boot delay)
Expand Down

0 comments on commit 0d8d63c

Please sign in to comment.