From 4fa10afecb0088c6b03c858444152d2ca52930ee Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Tue, 11 Aug 2015 14:33:43 -0700
Subject: [PATCH] Test dib image builds with devstack too.

This adds a second nodepool label that the devstack plugin will attempt
to build and boot. For this image it will use DIB to build a very
minimal ubuntu VM that should accept ssh connections from nodepool.

Note it adds system deps for dib including debootstrap.

Change-Id: I2f0e8ee83f24ec79626d0d8799064cd0a2d6424f
---
 devstack/files/debs/nodepool |  3 +++
 devstack/files/rpms/nodepool |  3 +++
 devstack/plugin.sh           | 45 ++++++++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+)
 create mode 100644 devstack/files/debs/nodepool
 create mode 100644 devstack/files/rpms/nodepool

diff --git a/devstack/files/debs/nodepool b/devstack/files/debs/nodepool
new file mode 100644
index 000000000..11c1f933f
--- /dev/null
+++ b/devstack/files/debs/nodepool
@@ -0,0 +1,3 @@
+qemu-utils
+kpartx
+debootstrap
diff --git a/devstack/files/rpms/nodepool b/devstack/files/rpms/nodepool
new file mode 100644
index 000000000..f5cec3fbb
--- /dev/null
+++ b/devstack/files/rpms/nodepool
@@ -0,0 +1,3 @@
+qemu-img
+kpartx
+debootstrap
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 37f7b0ad5..e3f8be5ef 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -56,6 +56,23 @@ EOF
 
     sudo chmod a+x $(dirname $NODEPOOL_CONFIG)/scripts/prepare_node_ubuntu.sh
 
+    sudo mkdir -p $(dirname $NODEPOOL_CONFIG)/elements/nodepool-setup/install.d
+    cat > /tmp/01-nodepool-setup <<EOF
+sudo DEBIAN_FRONTEND=noninteractive apt-get install -y openssh-server
+sudo mkdir -p /etc/nodepool
+# Make it world writeable so nodepool can write here later.
+sudo chmod 777 /etc/nodepool
+EOF
+
+    sudo mv /tmp/01-nodepool-setup \
+        $(dirname $NODEPOOL_CONFIG)/elements/nodepool-setup/install.d/01-nodepool-setup
+    sudo chmod a+x \
+        $(dirname $NODEPOOL_CONFIG)/elements/nodepool-setup/install.d/01-nodepool-setup
+    sudo mkdir -p $(dirname $NODEPOOL_CONFIG)/images
+    sudo mkdir -p /opt/dib/tmp
+    sudo mkdir -p /opt/dib/cache
+    sudo chown stack:stack $(dirname $NODEPOOL_CONFIG)/images
+    sudo chown -R stack:stack /opt/dib
 }
 
 function nodepool_write_config {
@@ -69,6 +86,7 @@ function nodepool_write_config {
 # example script for /path/to/nodepool/things/scripts.
 script-dir: $(dirname $NODEPOOL_CONFIG)/scripts
 elements-dir: $(dirname $NODEPOOL_CONFIG)/elements
+images-dir: $(dirname $NODEPOOL_CONFIG)/images
 # The mysql password here may be different depending on your
 # devstack install, you should double check it (the devstack var
 # is MYSQL_PASSWORD and if unset devstack should prompt you for
@@ -97,6 +115,11 @@ labels:
     min-ready: 1
     providers:
       - name: devstack
+  - name: ubuntu-dib
+    image: ubuntu-dib
+    min-ready: 1
+    providers:
+      - name: devstack
 
 providers:
   - name: devstack
@@ -123,6 +146,28 @@ providers:
         # Alter below to point to your local user private key
         private-key: $NODEPOOL_KEY
         config-drive: true
+      - name: ubuntu-dib
+        min-ram: 1024
+        diskimage: ubuntu-dib
+        username: devuser
+        private-key: $NODEPOOL_KEY
+        config-drive: true
+
+diskimages:
+  - name: ubuntu-dib
+    elements:
+      - ubuntu-minimal
+      - vm
+      - simple-init
+      - devuser
+      - nodepool-setup
+    release: trusty
+    env-vars:
+      TMPDIR: /opt/dib/tmp
+      DIB_IMAGE_CACHE: /opt/dib/cache
+      DIB_APT_LOCAL_CACHE: '0'
+      DIB_DISABLE_APT_CLEANUP: '1'
+      DIB_DEV_USER_AUTHORIZED_KEYS: $NODEPOOL_PUBKEY
 EOF
 
     sudo mv /tmp/nodepool.yaml $NODEPOOL_CONFIG