From 49d7f31d496d9ecf5aa822e3f533a8692ba30a3c Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Mon, 8 Sep 2014 11:15:27 -0700 Subject: [PATCH] coreos-base/oem-ec2-compat: Update cloud-init flags Use the new --from-ec2-metadata flag. --from-metadata-service is depricated. --- .../coreos-base/oem-ec2-compat/files/cloud-config.yml | 2 +- ...c2-compat-0.0.2-r1.ebuild => oem-ec2-compat-0.0.2-r2.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/{oem-ec2-compat-0.0.2-r1.ebuild => oem-ec2-compat-0.0.2-r2.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/cloud-config.yml index 06a22f3d00..913f838fa7 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/cloud-config.yml +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/cloud-config.yml @@ -15,7 +15,7 @@ coreos: [Service] Type=oneshot - ExecStart=/usr/bin/coreos-cloudinit --from-configdrive=/media/configdrive --from-metadata-service + ExecStart=/usr/bin/coreos-cloudinit --from-configdrive=/media/configdrive --from-ec2-metadata=http://169.254.169.254/ oem: id: @@OEM_ID@@ name: @@OEM_NAME@@ diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.2-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.2-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.2-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.2-r2.ebuild