From 710a9b49c184517177461706e6cb3ec0684b6b18 Mon Sep 17 00:00:00 2001
From: Matthew Thode <mthode@mthode.org>
Date: Thu, 19 May 2016 19:26:08 -0500
Subject: [PATCH] Remove node-devstack from nodepool

Here we fully remove node-devstack from nodepool.  I've changed
refrences to it to be cache-devstack as that is the only function the
now defunct node-devstack element was providing.  I did not do this to
openstack-repos as it has already moved to the prepare-node element.

Change-Id: I1dacd9e1af5ebb6056998f6f2705317eddc87714
Signed-off-by: Matthew Thode <mthode@mthode.org>
---
 nodepool/nodepool.yaml | 12 ++++++------
 tools/build-image.sh   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml
index 323110d321..66e95304a8 100644
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@@ -696,7 +696,7 @@ diskimages:
       - simple-init
       - openstack-repos
       - nodepool-base
-      - node-devstack
+      - cache-devstack
       - cache-bindep
       - growroot
       - infra-package-needs
@@ -714,7 +714,7 @@ diskimages:
       - simple-init
       - openstack-repos
       - nodepool-base
-      - node-devstack
+      - cache-devstack
       - cache-bindep
       - growroot
       - infra-package-needs
@@ -732,7 +732,7 @@ diskimages:
       - simple-init
       - openstack-repos
       - nodepool-base
-      - node-devstack
+      - cache-devstack
       - cache-bindep
       - growroot
       - infra-package-needs
@@ -749,7 +749,7 @@ diskimages:
       - simple-init
       - openstack-repos
       - nodepool-base
-      - node-devstack
+      - cache-devstack
       - cache-bindep
       - growroot
       - infra-package-needs
@@ -766,7 +766,7 @@ diskimages:
       - simple-init
       - openstack-repos
       - nodepool-base
-      - node-devstack
+      - cache-devstack
       - puppet
       - cache-bindep
       - growroot
@@ -782,7 +782,7 @@ diskimages:
       - simple-init
       - openstack-repos
       - nodepool-base
-      - node-devstack
+      - cache-devstack
       - puppet
       - cache-bindep
       - growroot
diff --git a/tools/build-image.sh b/tools/build-image.sh
index 3d6ca3ebe8..0880e2ecfc 100755
--- a/tools/build-image.sh
+++ b/tools/build-image.sh
@@ -30,4 +30,4 @@ 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 simple-init $EXTRA_ELEMENTS
+    vm openstack-repos puppet nodepool-base cache-devstack simple-init $EXTRA_ELEMENTS