From c0fd48390fb9cfa47c1f33b40a990f501c84a978 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Mon, 11 Jul 2016 12:34:20 -0700
Subject: [PATCH] Update build-image.sh to reflect nodepool config

We have added and moved elements around and that needs to be reflected
in tools/build-image.sh so that local image builds result in functional
images.

Change-Id: Iaba5eac8ff65b10d608c7d5aa84f083ee00a8319
---
 tools/build-image.sh | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/tools/build-image.sh b/tools/build-image.sh
index 0880e2ecfc..f64f76bb92 100755
--- a/tools/build-image.sh
+++ b/tools/build-image.sh
@@ -29,5 +29,16 @@ export CONFIG_SOURCE=${CONFIG_SOURCE:-https://git.openstack.org/openstack-infra/
 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 cache-devstack simple-init $EXTRA_ELEMENTS
+# The list of elements here should match nodepool/nodepool.yaml
+disk-image-create -x --no-tmpfs -o $IMAGE_NAME \
+    $DISTRO \
+    vm \
+    simple-init \
+    openstack-repos \
+    nodepool-base \
+    cache-devstack \
+    cache-bindep \
+    growroot \
+    infra-package-needs \
+    stackviz \
+    $EXTRA_ELEMENTS