From dc33f6ddd090696810868750f8b9916a1dfb4fc0 Mon Sep 17 00:00:00 2001
From: Gregory Haynes <greg@greghaynes.net>
Date: Mon, 11 May 2015 16:48:42 +0000
Subject: [PATCH] Simple-init should disable cloud-init

Cloud-init and simple-init are not meant to play together. Lets disable
cloud-init if simple-init is installed.

Also guarding cloud-init-datasources against running in an environment
where cloud-init is not installed.

Change-Id: I5bfa9a3e83d3259db2436404034ad58c780de1c9
---
 .../install.d/05-set-cloud-init-sources            | 14 ++++++++------
 elements/simple-init/element-deps                  |  1 +
 .../environment.d/50-disable-cloud-init            |  1 +
 3 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 elements/simple-init/environment.d/50-disable-cloud-init

diff --git a/elements/cloud-init-datasources/install.d/05-set-cloud-init-sources b/elements/cloud-init-datasources/install.d/05-set-cloud-init-sources
index 0f3d6662..0d833c7f 100755
--- a/elements/cloud-init-datasources/install.d/05-set-cloud-init-sources
+++ b/elements/cloud-init-datasources/install.d/05-set-cloud-init-sources
@@ -14,14 +14,16 @@ if [ -z "$DIB_CLOUD_INIT_DATASOURCES" ] ; then
     exit 1
 fi
 
-# DatasourceNone doesn't exist in Ubuntu 12.04 (Precise)
-# which uses cloud-init version 0.6.3
-if [ "$(lsb_release -cs)" = 'precise' ] ; then
-    cat > /etc/cloud/cloud.cfg.d/91-dib-cloud-init-datasources.cfg <<EOF
+if [ -d /etc/cloud/cloud.cfg.d ]; then
+    # DatasourceNone doesn't exist in Ubuntu 12.04 (Precise)
+    # which uses cloud-init version 0.6.3
+    if [ "$(lsb_release -cs)" = 'precise' ] ; then
+        cat > /etc/cloud/cloud.cfg.d/91-dib-cloud-init-datasources.cfg <<EOF
 datasource_list: [  $DIB_CLOUD_INIT_DATASOURCES ]
 EOF
-else
-    cat > /etc/cloud/cloud.cfg.d/91-dib-cloud-init-datasources.cfg <<EOF
+    else
+        cat > /etc/cloud/cloud.cfg.d/91-dib-cloud-init-datasources.cfg <<EOF
 datasource_list: [  $DIB_CLOUD_INIT_DATASOURCES, None ]
 EOF
+    fi
 fi
diff --git a/elements/simple-init/element-deps b/elements/simple-init/element-deps
index d78d4eeb..b969ed87 100644
--- a/elements/simple-init/element-deps
+++ b/elements/simple-init/element-deps
@@ -1,3 +1,4 @@
+cloud-init-datasources
 dib-init-system
 install-types
 source-repositories
diff --git a/elements/simple-init/environment.d/50-disable-cloud-init b/elements/simple-init/environment.d/50-disable-cloud-init
new file mode 100644
index 00000000..ccd3f2ba
--- /dev/null
+++ b/elements/simple-init/environment.d/50-disable-cloud-init
@@ -0,0 +1 @@
+export DIB_CLOUD_INIT_DATASOURCES="None"