From 0ff40cf63ca84346b3d7f254a69368e214928a18 Mon Sep 17 00:00:00 2001
From: Simon Leinen <simon.leinen@gmail.com>
Date: Sat, 15 Apr 2017 19:01:42 +0200
Subject: [PATCH] Turn off strict_id mode for Ec2 datasource

Recent changes in the default configuration of cloud-init in Ubuntu
cause warnings when the Ec2 datasource is used on non-Amazon clouds,
see https://bugs.launchpad.net/cloud-init/+bug/1660385

We explicitly select the previous behavior when an Ec2 datasource is
desired.

Change-Id: Iebad8f6c0017fe08013dd5fe667c6132158b71cd
Closes-bug: 1683038
---
 .../install.d/05-set-cloud-init-sources             | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/diskimage_builder/elements/cloud-init-datasources/install.d/05-set-cloud-init-sources b/diskimage_builder/elements/cloud-init-datasources/install.d/05-set-cloud-init-sources
index 0d833c7f..b0995365 100755
--- a/diskimage_builder/elements/cloud-init-datasources/install.d/05-set-cloud-init-sources
+++ b/diskimage_builder/elements/cloud-init-datasources/install.d/05-set-cloud-init-sources
@@ -24,6 +24,19 @@ EOF
     else
         cat > /etc/cloud/cloud.cfg.d/91-dib-cloud-init-datasources.cfg <<EOF
 datasource_list: [  $DIB_CLOUD_INIT_DATASOURCES, None ]
+EOF
+    fi
+    # Newer cloud-init versions complain by default when they should
+    # use the Ec2 datasource on a non-AWS cloud.  If the Ec2
+    # datasource is desired, we need to tell cloud-init that we really
+    # want this.  Otherwise there will be ugly warnings or worse.
+    #
+    if [[ $DIB_CLOUD_INIT_DATASOURCES =~ Ec2 ]]; then
+        cat > /etc/cloud/cloud.cfg.d/92-ec2-datasource.cfg <<EOF
+#cloud-config
+datasource:
+    Ec2:
+        strict_id: false
 EOF
     fi
 fi