foudres) test-cloud-init % diff -urN core_20170331/usr/lib/cloud-init/ds-identify core_20170421/usr/lib/cloud-init/ds-identify 
--- core_20170331/usr/lib/cloud-init/ds-identify	2011-12-16 10:50:25.000000000 -0600
+++ core_20170421/usr/lib/cloud-init/ds-identify	2017-04-10 17:46:29.000000000 -0500
@@ -83,8 +83,8 @@
 # set DI_MAIN='noop' in environment to source this file with no main called.
 DI_MAIN=${DI_MAIN:-main}
 
-DI_DEFAULT_POLICY="search,found=all,maybe=all,notfound=${DI_DISABLED}"
-DI_DEFAULT_POLICY_NO_DMI="search,found=all,maybe=all,notfound=${DI_ENABLED}"
+DI_DEFAULT_POLICY="report,found=all,maybe=all,notfound=${DI_ENABLED}"
+DI_DEFAULT_POLICY_NO_DMI="report,found=all,maybe=all,notfound=${DI_ENABLED}"
 DI_DMI_PRODUCT_NAME=""
 DI_DMI_SYS_VENDOR=""
 DI_DMI_PRODUCT_SERIAL=""
@@ -117,7 +117,7 @@
 DI_ON_MAYBE=""
 DI_ON_NOTFOUND=""
 
-DI_EC2_STRICT_ID_DEFAULT="true"
+DI_EC2_STRICT_ID_DEFAULT="warn"
 
 error() {
     set -- "ERROR:" "$@";