From 92cf4d83eb986ef397345a5765b890e83b9ac29d Mon Sep 17 00:00:00 2001
From: Mark McClain <mark@mcclain.xyz>
Date: Sun, 12 Apr 2015 17:29:41 -0400
Subject: [PATCH] update to enable config drive and IP config via user-data

This change updates the build scripts enables config drive while removing
old seed data out of the images.

Change-Id: I999322e4cb7cc9dc2ccdbc90af658e4cc2b7b63e
---
 diskimage-builder/README.md                   | 20 +++++++++++++++----
 .../elements/akanda/element-deps              |  3 +--
 .../akanda/environment.d/10-cloudinit-akanda  |  1 +
 nocloud/README.md                             | 12 +++++++++++
 .../cloud/seed/nocloud => nocloud}/meta-data  |  0
 .../cloud/seed/nocloud => nocloud}/user-data  |  3 +--
 6 files changed, 31 insertions(+), 8 deletions(-)
 create mode 100755 diskimage-builder/elements/akanda/environment.d/10-cloudinit-akanda
 create mode 100644 nocloud/README.md
 rename {diskimage-builder/elements/akanda/static/var/lib/cloud/seed/nocloud => nocloud}/meta-data (100%)
 rename {diskimage-builder/elements/akanda/static/var/lib/cloud/seed/nocloud => nocloud}/user-data (84%)

diff --git a/diskimage-builder/README.md b/diskimage-builder/README.md
index 9c2513f..75715dc 100644
--- a/diskimage-builder/README.md
+++ b/diskimage-builder/README.md
@@ -1,10 +1,22 @@
 This directory contains elements necessary to build the Akanda appliance with
 the diskimage-builder from the OpenStack project.
 
-Install via:
+1) Install diskimage-builder via:
 
-pip install diskimage-builder
+    pip install diskimage-builder
+    or source at:
+    http://git.openstack.org/cgit/openstack/diskimage-builder
+
+2) Ensure a few require packages are installed:
+ - debootstrap
+ - qemu-utils
+
+3) Add elements to path
+    $ export ELEMENTS_PATH=~/akanda-appliance-builder/diskimage-builder/elements
+
+4) Build image
+    $ DIB_RELEASE=wheezy DIB_EXTLINUX=1 disk-image-create debian vm akanda
+
+5) If you're testing with kvm, don't forget to build the nocloud iso image
 
-or source at:
 
-http://git.openstack.org/cgit/openstack/diskimage-builder
diff --git a/diskimage-builder/elements/akanda/element-deps b/diskimage-builder/elements/akanda/element-deps
index aba5f05..9ee9ee8 100644
--- a/diskimage-builder/elements/akanda/element-deps
+++ b/diskimage-builder/elements/akanda/element-deps
@@ -1,4 +1,3 @@
-install-static
-cloud-init-nocloud
+cloud-init-datasources
 source-repositories
 ansible
diff --git a/diskimage-builder/elements/akanda/environment.d/10-cloudinit-akanda b/diskimage-builder/elements/akanda/environment.d/10-cloudinit-akanda
new file mode 100755
index 0000000..10cdc63
--- /dev/null
+++ b/diskimage-builder/elements/akanda/environment.d/10-cloudinit-akanda
@@ -0,0 +1 @@
+export DIB_CLOUD_INIT_DATASOURCES="ConfigDrive, NoCloud"
diff --git a/nocloud/README.md b/nocloud/README.md
new file mode 100644
index 0000000..bb55fdf
--- /dev/null
+++ b/nocloud/README.md
@@ -0,0 +1,12 @@
+The files in this directory help to make test nocloud disk image:
+
+genisoimage  -output seed.iso -volid cidata -joliet -rock user-data meta-data
+
+You can test the image in kvm without OpenStack by invoking kvm like this:
+
+kvm -m 1024 -curses -net nic,model=virtio,macaddr=52:54:00:12:34:56 \
+ -net tap,ifname=tap0 \
+-drive file=image.qcow2,if=virtio \
+-drive file=seed.iso,if=virtio
+
+
diff --git a/diskimage-builder/elements/akanda/static/var/lib/cloud/seed/nocloud/meta-data b/nocloud/meta-data
similarity index 100%
rename from diskimage-builder/elements/akanda/static/var/lib/cloud/seed/nocloud/meta-data
rename to nocloud/meta-data
diff --git a/diskimage-builder/elements/akanda/static/var/lib/cloud/seed/nocloud/user-data b/nocloud/user-data
similarity index 84%
rename from diskimage-builder/elements/akanda/static/var/lib/cloud/seed/nocloud/user-data
rename to nocloud/user-data
index 5d9631b..c957a4c 100644
--- a/diskimage-builder/elements/akanda/static/var/lib/cloud/seed/nocloud/user-data
+++ b/nocloud/user-data
@@ -15,8 +15,7 @@ debug:
   - verbose: true
 
 bootcmd:
-  - ip link list
-  - ip addr list
+  - /usr/local/bin/akanda-configure-management 52:54:00:12:34:56 fdca:3ba5:a17a:acda:5054:ff:fe12:3456
 
 users:
   - name: akanda