From 449d432feb899f6e47d0a5c0ac4b1f95c35a3d9f Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Sun, 10 May 2015 12:57:09 -0400
Subject: [PATCH] Don't disable cloud-init if it is not installed

When we're building nodepool images on top of minimal elements, there
will be no cloud-init, and therefore no need to disable cloud-init
datasources. In fact, trying to do so will be an error.

Change-Id: I98887c43566e07f2be9d2dc5fae6538078c7348e
---
 .../nodepool-base/install.d/50-disable-metadata-cloudinit  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/nodepool/elements/nodepool-base/install.d/50-disable-metadata-cloudinit b/nodepool/elements/nodepool-base/install.d/50-disable-metadata-cloudinit
index c2cb57c9f2..f584ba2bbe 100755
--- a/nodepool/elements/nodepool-base/install.d/50-disable-metadata-cloudinit
+++ b/nodepool/elements/nodepool-base/install.d/50-disable-metadata-cloudinit
@@ -13,7 +13,10 @@
 # implied.
 
 # Make all cloud-init data sources match rackspace- only attempt to look
-# at ConfigDrive, not at metadata service
-dd of=/etc/cloud/cloud.cfg.d/95_real_datasources.cfg <<EOF
+# at ConfigDrive, not at metadata service. This is not needed if there
+# is no cloud-init
+if [ -d /etc/cloud/cloud.cfg.d ] ; then
+    dd of=/etc/cloud/cloud.cfg.d/95_real_datasources.cfg <<EOF
 datasource_list: [ ConfigDrive, None ]
 EOF
+fi