openstack/diskimage-builder
Code Issues Proposed changes

Merge "Reinstate Trusty as default for Ubuntu"

Browse Source
This commit is contained in:
Jenkins 2014-06-11 04:28:56 +00:00 committed by Gerrit Code Review
commit 6ff1681915
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elements/ramdisk/README.md
View File

@ -10,5 +10,7 @@ and scripts need to be injected into a ramdisk that will fetch and apply a
machine image to local disks. That tooling/scripting customisation can be machine image to local disks. That tooling/scripting customisation can be
easily applied in a repeatable and automatable way, using this element. easily applied in a repeatable and automatable way, using this element.
NOTE: ramdisks require 1GB minimum memory on the machines they are booting.
See the top-level README.md of the project, for more information about the See the top-level README.md of the project, for more information about the
mechanisms available to a ramdisk element. mechanisms available to a ramdisk element.

2
elements/ubuntu/root.d/10-cache-ubuntu-tarball
View File

@ -10,7 +10,7 @@ set -o pipefail
shopt -s extglob shopt -s extglob
DIB_CLOUD_IMAGES=${DIB_CLOUD_IMAGES:-http://cloud-images.ubuntu.com/} DIB_CLOUD_IMAGES=${DIB_CLOUD_IMAGES:-http://cloud-images.ubuntu.com/}
DIB_RELEASE=${DIB_RELEASE:-saucy} DIB_RELEASE=${DIB_RELEASE:-trusty}
BASE_IMAGE_FILE=${BASE_IMAGE_FILE:-$DIB_RELEASE-server-cloudimg-$ARCH-root.tar.gz} BASE_IMAGE_FILE=${BASE_IMAGE_FILE:-$DIB_RELEASE-server-cloudimg-$ARCH-root.tar.gz}
SHA256SUMS=${SHA256SUMS:-https://${DIB_CLOUD_IMAGES##http?(s)://}/$DIB_RELEASE/current/SHA256SUMS} SHA256SUMS=${SHA256SUMS:-https://${DIB_CLOUD_IMAGES##http?(s)://}/$DIB_RELEASE/current/SHA256SUMS}
CACHED_FILE=$DIB_IMAGE_CACHE/$BASE_IMAGE_FILE CACHED_FILE=$DIB_IMAGE_CACHE/$BASE_IMAGE_FILE