From 5482bcac599d5ccdd706f89d632886b5c7a01b07 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Fri, 10 Oct 2014 18:05:39 -0700 Subject: [PATCH] coreos-base/oem-azure: use cloud-init --oem flag --- .../coreos-base/oem-azure/files/cloud-config.yml | 15 +++++++++++---- ...ure-0.0.1-r2.ebuild => oem-azure-0.0.2.ebuild} | 0 2 files changed, 11 insertions(+), 4 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/{oem-azure-0.0.1-r2.ebuild => oem-azure-0.0.2.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/cloud-config.yml index 52763d4b82..c297ce993a 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/cloud-config.yml +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/cloud-config.yml @@ -2,10 +2,6 @@ coreos: units: - - name: user-cloudinit@var-lib-waagent-CustomData.path - command: start - runtime: true - - name: waagent.service command: start runtime: true @@ -19,6 +15,17 @@ coreos: Type=simple ExecStart=/usr/share/oem/python/bin/python /usr/share/oem/bin/waagent -daemon + - name: oem-cloudinit.service + command: restart + runtime: yes + content: | + [Unit] + Description=Cloudinit from Azure metadata + + [Service] + Type=oneshot + ExecStart=/usr/bin/coreos-cloudinit --oem=azure + oem: id: azure name: Microsoft Azure diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-0.0.1-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-0.0.2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-0.0.1-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/oem-azure-0.0.2.ebuild