From fbc373563281c31ef367e11ebe1d3a1db2de9720 Mon Sep 17 00:00:00 2001
From: Matthew Thode <mthode@mthode.org>
Date: Fri, 12 Oct 2018 19:11:06 -0500
Subject: [PATCH] move 01-nodepool-setup to a later phase

installs.d installs packages at 01-package-installs, this causes sudo
(installed from package-installs.yaml) to be installed AFTER
01-nodepool-setup is run.  Move it later as the files it sets up are not
needed until after reboot.

Change-Id: I238e517c983793589faa2c1e2dc0b13c70529d4a
---
 devstack/plugin.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index cc049e853..b8c9ab084 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -74,7 +74,7 @@ EOF
 function nodepool_write_elements {
     sudo mkdir -p $(dirname $NODEPOOL_CONFIG)/elements/nodepool-setup/install.d
     sudo mkdir -p $(dirname $NODEPOOL_CONFIG)/elements/nodepool-setup/root.d
-    cat > /tmp/01-nodepool-setup <<EOF
+    cat > /tmp/40-nodepool-setup <<EOF
 sudo mkdir -p /etc/nodepool
 # Make it world writeable so nodepool can write here later.
 sudo chmod 777 /etc/nodepool
@@ -85,10 +85,10 @@ if [ -d "\$TARGET_ROOT/etc/apt/apt.conf.d" ]; then
     echo "Acquire::AllowInsecureRepositories \"true\";" | sudo tee -a \$TARGET_ROOT/etc/apt/apt.conf.d/95allow-unauthenticated
 fi
 EOF
-    sudo mv /tmp/01-nodepool-setup \
-        $(dirname $NODEPOOL_CONFIG)/elements/nodepool-setup/install.d/01-nodepool-setup
+    sudo mv /tmp/40-nodepool-setup \
+        $(dirname $NODEPOOL_CONFIG)/elements/nodepool-setup/install.d/40-nodepool-setup
     sudo chmod a+x \
-        $(dirname $NODEPOOL_CONFIG)/elements/nodepool-setup/install.d/01-nodepool-setup
+        $(dirname $NODEPOOL_CONFIG)/elements/nodepool-setup/install.d/40-nodepool-setup
     sudo mv /tmp/50-apt-allow-unauthenticated \
         $(dirname $NODEPOOL_CONFIG)/elements/nodepool-setup/root.d/50-apt-allow-unauthenticated
     sudo chmod a+x \