From 26641b6561e2f7eb01238b5de2888c11a1e92c5c Mon Sep 17 00:00:00 2001 From: Jim Rollenhagen Date: Mon, 28 Mar 2016 16:19:59 -0700 Subject: [PATCH] Update build-image.sh for new images, add EXTRA_ELEMENTS This changes the base element for build-image.sh to ubuntu-minimal, and adds the simple-init element, to make this match the images used in the gate. It also adds an EXTRA_ELEMENTS environment variable that users can use to add elements to the image. For example, local-config is useful to put the current user's ssh keys in the image. Last, it documents the things I needed to install to get it to run correctly on Ubuntu; this is likely not an exhaustive list. Change-Id: I2506c6722b77bb2f861d08e7a6da453dc2bbbfc2 --- tools/build-image.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/build-image.sh b/tools/build-image.sh index 3292511a97..3d6ca3ebe8 100755 --- a/tools/build-image.sh +++ b/tools/build-image.sh @@ -14,14 +14,20 @@ # See the License for the specific language governing permissions and # limitations under the License. +# To run on Ubuntu 14.04, this depends on: +# diskimage-builder +# qemu-utils +# debootstrap + set -e export ELEMENTS_PATH=${ELEMENTS_PATH:-nodepool/elements} -export DISTRO=${DISTRO:-ubuntu} +export DISTRO=${DISTRO:-ubuntu-minimal} export IMAGE_NAME=${IMAGE_NAME:-devstack-gate} export NODEPOOL_SCRIPTDIR=${NODEPOOL_SCRIPTDIR:-nodepool/scripts} export CONFIG_SOURCE=${CONFIG_SOURCE:-https://git.openstack.org/openstack-infra/system-config} export CONFIG_REF=${CONFIG_REF:-master} +export EXTRA_ELEMENTS=${EXTRA_ELEMENTS:-} disk-image-create -x --no-tmpfs -o $IMAGE_NAME $DISTRO \ - vm openstack-repos puppet nodepool-base node-devstack + vm openstack-repos puppet nodepool-base node-devstack simple-init $EXTRA_ELEMENTS