From cfd586fede7e4056a755b786dc278f1b889368ca Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Tue, 2 Sep 2014 10:13:51 -0700 Subject: [PATCH 1/2] coreos-base/coreos-cloudinit: bump to v0.9.5 --- ...eos-cloudinit-0.9.4.ebuild => coreos-cloudinit-0.9.5.ebuild} | 0 .../coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/{coreos-cloudinit-0.9.4.ebuild => coreos-cloudinit-0.9.5.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-0.9.4.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-0.9.5.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-0.9.4.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-0.9.5.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild index 04fad45fc5..ae6131094b 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild @@ -9,7 +9,7 @@ CROS_WORKON_REPO="git://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64" else - CROS_WORKON_COMMIT="5e112147bb747f2837aadb74bdfc0b0c592c3515" # tag v0.9.4 + CROS_WORKON_COMMIT="685a38c6c832ee08ac4026e0125b13050b260bc8" # tag v0.9.5 KEYWORDS="amd64" fi From 8f1bd1d6d56fc91951f3626228a30b73e99ab19d Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Fri, 8 Aug 2014 15:15:05 -0700 Subject: [PATCH 2/2] coreos-base/oem-digitalocean: Add DigitalOcean OEM --- .../oem-digitalocean/files/cloud-config.yml | 29 +++++++++++++++++++ .../oem-digitalocean-0.0.1.ebuild | 20 +++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/cloud-config.yml create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/oem-digitalocean-0.0.1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/cloud-config.yml new file mode 100644 index 0000000000..26f020afa1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/cloud-config.yml @@ -0,0 +1,29 @@ +#cloud-config + +coreos: + units: + - name: 99-public-interface.network + runtime: yes + content: | + [Match] + Path=*:03.0 + + [Network] + IPv4LL=true + - name: systemd-networkd.service + command: restart + - name: oem-cloudinit.service + command: restart + runtime: yes + content: | + [Unit] + Description=Cloudinit from DigitalOcean metadata + + [Service] + Type=oneshot + ExecStart=/usr/bin/coreos-cloudinit --from-digitalocean-metadata=http://169.254.169.254/ --convert-netconf=digitalocean + oem: + id: digitalocean + name: DigitalOcean + home-url: https://www.digitalocean.com/ + bug-report-url: https://github.com/coreos/bugs/issues diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/oem-digitalocean-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/oem-digitalocean-0.0.1.ebuild new file mode 100644 index 0000000000..74f19cd044 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/oem-digitalocean-0.0.1.ebuild @@ -0,0 +1,20 @@ +# Copyright (c) 2014 CoreOS, Inc.. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +DESCRIPTION="OEM suite for DigitalOcean images" +HOMEPAGE="" +SRC_URI="" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 x86" + +# no source directory +S="${WORKDIR}" + +src_install() { + insinto "/usr/share/oem" + doins ${FILESDIR}/cloud-config.yml +}