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
This commit is contained in:
Jim Rollenhagen 2016-03-28 16:19:59 -07:00
parent 0f9b5f8401
commit 26641b6561

View File

@ -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