From fea10c7ad1e6a7a7ffdd416913324d836d7c1a9a Mon Sep 17 00:00:00 2001
From: Alex Polvi <alex@polvi.net>
Date: Wed, 12 Mar 2014 17:48:16 -0700
Subject: [PATCH] wip, add nova-agent-watcher powered by cloudinit

---
 .../coreos-cloudinit-9999.ebuild              |  2 +-
 .../nova-agent-watcher-0.0.1.ebuild           |  1 +
 .../nova-agent-watcher-9999.ebuild            | 35 +++++++++++++++++++
 .../coreos-base/oem-rackspace/files/run       |  3 +-
 .../oem-rackspace/oem-rackspace-0.0.1.ebuild  |  4 +++
 5 files changed, 42 insertions(+), 3 deletions(-)
 create mode 120000 sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/nova-agent-watcher-0.0.1.ebuild
 create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/nova-agent-watcher-9999.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 b1d75cb872..7a32861613 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="d823f99f7d491b84e4bc91f492bf2aefef6846b5"  # tag v0.1.1
+	CROS_WORKON_COMMIT="6a6897831a8ada4cab112001620b08b0e31dfe89"  # tag v0.1.1
 	KEYWORDS="amd64"
 fi
 
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/nova-agent-watcher-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/nova-agent-watcher-0.0.1.ebuild
new file mode 120000
index 0000000000..9723e177c8
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/nova-agent-watcher-0.0.1.ebuild
@@ -0,0 +1 @@
+nova-agent-watcher-9999.ebuild
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/nova-agent-watcher-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/nova-agent-watcher-9999.ebuild
new file mode 100644
index 0000000000..475dbe4a62
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/nova-agent-watcher/nova-agent-watcher-9999.ebuild
@@ -0,0 +1,35 @@
+# Copyright (c) 2014 CoreOS, Inc.. All rights reserved.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+CROS_WORKON_PROJECT="coreos/nova-agent-watcher"
+CROS_WORKON_LOCALNAME="nova-agent-watcher"
+CROS_WORKON_REPO="git://github.com"
+
+if [[ "${PV}" == 9999 ]]; then
+	KEYWORDS="~amd64"
+else
+	CROS_WORKON_COMMIT="bff26eea5578ca36115707d46d5bdc865d69a460"  # tag v0.1.1
+	KEYWORDS="amd64"
+fi
+
+inherit cros-workon systemd
+
+DESCRIPTION="nova-agent-watcher"
+HOMEPAGE="https://github.com/coreos/nova-agent-watcher"
+SRC_URI=""
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.2"
+
+src_compile() {
+	./build || die
+}
+
+src_install() {
+	dobin ${S}/scripts/gentoo-to-networkd
+	dobin ${S}/bin/nova-agent-watcher
+}
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/run b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/run
index 98506fa240..5cd917d67e 100755
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/run
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/files/run
@@ -1,4 +1,3 @@
 #!/bin/bash
 
-systemctl enable --runtime /usr/share/oem/system/*
-systemctl start oem.target
+/usr/bin/systemd-run /usr/share/oem/usr/bin/nova-agent-watcher -watch-dir=/usr/share/oem/nova-agent -scripts-dir=/usr/share/oem/usr/bin/
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1.ebuild
index 50afaa3c74..a3583df7ab 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-rackspace/oem-rackspace-0.0.1.ebuild
@@ -20,6 +20,10 @@ IUSE=""
 EGIT_REPO_URI="https://github.com/coreos/nova-agent-container.git"
 EGIT_COMMIT="44af5608e9a9e43fe83d05f03049a1f66d564930"
 
+RDEPEND="
+	coreos-base/nova-agent-watcher
+"
+
 src_install() {
 	rsync --exclude=".git" -aq ${S}/ ${D}/nova-agent/
 	rsync -aq ${FILESDIR}/systemd/ ${D}/system/