From f61c1acf81dc73aaa3ed80ff734dbe0a6817b284 Mon Sep 17 00:00:00 2001
From: Adam Gandelman <adamg@ubuntu.com>
Date: Tue, 3 Jun 2014 14:54:22 -0700
Subject: [PATCH] Only use Ec2 cloud-init data source for Ubuntu
Default to only having cloud-init query Ec2 on first boot for Ubuntu,
until cloud-init has been SRU'd to fix the CloudSigma data source issue
that causes Trusty boots to hang.
Change-Id: Icb3734d5ae78f4a0a6c0fae1af4a2ce3c809308c
Partial-bug: #1316475
---
elements/ubuntu/element-deps | 3 ++-
elements/ubuntu/environment.d/99-cloud-init-datasources.bash | 4 ++++
2 files changed, 6 insertions(+), 1 deletion(-)
create mode 100644 elements/ubuntu/environment.d/99-cloud-init-datasources.bash
diff --git a/elements/ubuntu/element-deps b/elements/ubuntu/element-deps
index 100657ee4..c575e9090 100644
--- a/elements/ubuntu/element-deps
+++ b/elements/ubuntu/element-deps
@@ -1,4 +1,5 @@
cache-url
+cloud-init-datasources
dib-run-parts
dkms
-dpkg
\ No newline at end of file
+dpkg
diff --git a/elements/ubuntu/environment.d/99-cloud-init-datasources.bash b/elements/ubuntu/environment.d/99-cloud-init-datasources.bash
new file mode 100644
index 000000000..bd25409f6
--- /dev/null
+++ b/elements/ubuntu/environment.d/99-cloud-init-datasources.bash
@@ -0,0 +1,4 @@
+# NOTE(adam_g): Until (LP: #1316475) is resolved in Ubuntu, default to only
+# allowing the Ec2 data source from being queried on first boot, unless
+# specified otherwise.
+export DIB_CLOUD_INIT_DATASOURCES=${DIB_CLOUD_INIT_DATASOURCES:-"Ec2"}