Merge pull request #2239 from crawford/digitalocean

coreos-base/oem-digitalocean: use ignition

sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/cloud-config.yml

@@ -1,30 +0,0 @@
-#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 --oem=digitalocean
-    oem:
-      id: digitalocean
-      name: DigitalOcean
-      version-id: @@OEM_VERSION_ID@@
-      home-url: https://www.digitalocean.com/
-      bug-report-url: https://github.com/coreos/bugs/issues

sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/files/oem-release

@@ -0,0 +1,5 @@
+ID=digitalocean
+VERSION_ID=@@OEM_VERSION_ID@@
+NAME="DigitalOcean"
+HOME_URL="https://www.digitalocean.com/"
+BUG_REPORT_URL="https://github.com/coreos/bugs/issues"

sdk_container/src/third_party/coreos-overlay/coreos-base/oem-digitalocean/oem-digitalocean-0.1.0.ebuild

@@ -16,11 +16,11 @@ S="${WORKDIR}"
 
 src_prepare() {
 	sed -e "s\\@@OEM_VERSION_ID@@\\${PVR}\\g" \
-	    "${FILESDIR}/cloud-config.yml" > "${T}/cloud-config.yml" || die
+	    "${FILESDIR}/oem-release" > "${T}/oem-release" || die
 }
 
 src_install() {
 	insinto "/usr/share/oem"
-	doins "${T}/cloud-config.yml"
 	doins "${FILESDIR}/grub.cfg"
+	doins "${T}/oem-release"
 }