now installing the right files...

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)

4 files changed, 87 insertions, 19 deletions

diff --git a/sys-cluster/neutron/ChangeLog b/sys-cluster/neutron/ChangeLog
index f76f58907d40..d2f347dfdb94 100644
--- a/sys-cluster/neutron/ChangeLog
+++ b/sys-cluster/neutron/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/neutron
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.12 2013/10/23 03:39:07 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.13 2013/10/23 16:13:26 prometheanfire Exp $
+
+  23 Oct 2013; Matthew Thode <prometheanfire@gentoo.org> +files/neutron-confd-2,
+  +files/neutron-initd-2, neutron-2013.2.9999.ebuild:
+  now installing the right files...
 
 *neutron-2013.2.9999 (23 Oct 2013)
 
diff --git a/sys-cluster/neutron/files/neutron-confd-2 b/sys-cluster/neutron/files/neutron-confd-2
new file mode 100644
index 000000000000..d7a9c043d327
--- /dev/null
+++ b/sys-cluster/neutron/files/neutron-confd-2
@@ -0,0 +1,2 @@
+#Don't touch this unless you know what you are doing
+PID_PATH=/run/neutron
diff --git a/sys-cluster/neutron/files/neutron-initd-2 b/sys-cluster/neutron/files/neutron-initd-2
new file mode 100644
index 000000000000..192d153ccd52
--- /dev/null
+++ b/sys-cluster/neutron/files/neutron-initd-2
@@ -0,0 +1,60 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+    need net
+}
+
+BASENAME=$(echo $SVCNAME | cut -d '-' -f 1)
+SERVERNAME=$(echo $SVCNAME | cut -d '-' -f 2)
+
+checkconfig() {
+    if [ ! -r /etc/conf.d/$BASENAME ]; then
+        eerror "No neutron conf.d file found: /etc/conf.d/$BASENAME)"
+        return 1
+    fi
+    return 0
+}
+
+start() {
+    checkconfig || return $?
+    . /etc/conf.d/$BASENAME
+    
+    ebegin "Starting ${SVCNAME}"
+
+    if [ ! -d ${PID_PATH} ]; then
+        mkdir ${PID_PATH}
+    fi
+
+    start-stop-daemon --start \
+        --user neutron:neutron \
+        --quiet \
+        --pidfile "${PID_PATH}/${SVCNAME}.pid" \
+        --make-pidfile \
+        --background \
+        --exec /usr/bin/${SVCNAME} -- \
+            --config-file /etc/neutron/neutron.conf \
+            --config-file /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini \
+                        --log-file /var/log/neutron/server.log
+
+    eend $? "Failed to start ${SVCNAME}"
+}
+
+stop() {
+    checkconfig || return $?
+    . /etc/conf.d/$BASENAME
+    
+    ebegin "Stopping ${SVCNAME}"
+    
+    start-stop-daemon --stop --user neutron --quiet --pidfile "${PID_PATH}/${SVCNAME}.pid" \
+                      --exec /usr/bin/${SVCNAME} -- \
+                      --config-file /etc/neutron/neutron.conf \
+                      --config-file /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini \
+                                          --log-file /var/log/neutron/server.log
+    eend $? "Failed to stop ${SVCNAME}"
+}
+
+#restart() {
+#
+#}
diff --git a/sys-cluster/neutron/neutron-2013.2.9999.ebuild b/sys-cluster/neutron/neutron-2013.2.9999.ebuild
index 13f7704feceb..88a577593b40 100644
--- a/sys-cluster/neutron/neutron-2013.2.9999.ebuild
+++ b/sys-cluster/neutron/neutron-2013.2.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2013.2.9999.ebuild,v 1.1 2013/10/23 03:39:07 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2013.2.9999.ebuild,v 1.2 2013/10/23 16:13:26 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -78,40 +78,42 @@ pkg_setup() {
 	enewuser neutron -1 -1 /var/lib/neutron neutron
 }
 
+src_prepare() {
+	#it's /bin/ip not /sbin/ip
+	sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/*
+}
+
 python_install() {
 	distutils-r1_python_install
-	newconfd "${FILESDIR}/neutron-confd" "quantum"
-	newinitd "${FILESDIR}/neutron-initd" "quantum"
+	newconfd "${FILESDIR}/neutron-confd" "neutron"
+	newinitd "${FILESDIR}/neutron-initd" "neutron"
 
-	use server && dosym /etc/init.d/quantum /etc/init.d/quantum-server
-	use dhcp && dosym /etc/init.d/quantum /etc/init.d/quantum-dhcp-agent
-	use l3 && dosym /etc/init.d/quantum /etc/init.d/quantum-l3-agent
-	use metadata && dosym /etc/init.d/quantum /etc/init.d/quantum-metadata-agent
-	use openvswitch && dosym /etc/init.d/quantum /etc/init.d/quantum-openvswitch-agent
+	use server && dosym /etc/init.d/neutron /etc/init.d/neutron-server
+	use dhcp && dosym /etc/init.d/neutron /etc/init.d/neutron-dhcp-agent
+	use l3 && dosym /etc/init.d/neutron /etc/init.d/neutron-l3-agent
+	use metadata && dosym /etc/init.d/neutron /etc/init.d/neutron-metadata-agent
+	use openvswitch && dosym /etc/init.d/neutron /etc/init.d/neutron-openvswitch-agent
 
 	diropts -m 750
-	dodir /var/log/neutron /var/log/quantum
+	dodir /var/log/neutron /var/log/neutron
 	fowners neutron:neutron /var/log/neutron
-	keepdir /etc/quantum
-	insinto /etc/quantum
-
-	#it's /bin/ip not /sbin/ip
-	sed -i 's/sbin\/ip\,/bin\/ip\,/g' "etc/quantum/rootwrap.d/*"
+	keepdir /etc/neutron
+	insinto /etc/neutron
 
 	doins "etc/api-paste.ini"
 	doins "etc/dhcp_agent.ini"
 	doins "etc/l3_agent.ini"
 	doins "etc/policy.json"
-	doins "etc/quantum.conf"
+	doins "etc/neutron.conf"
 	doins "etc/rootwrap.conf"
 	insinto /etc
-	doins -r "etc/quantum/"
+	doins -r "etc/neutron/"
 
 	#remove the etc stuff from usr...
 	rm -R "${D}/usr/etc/"
 
-	insinto "/usr/lib64/python2.7/site-packages/quantum/db/migration/alembic_migrations/"
-	doins -r "quantum/db/migration/alembic_migrations/versions"
+	insinto "/usr/lib64/python2.7/site-packages/neutron/db/migration/alembic_migrations/"
+	doins -r "neutron/db/migration/alembic_migrations/versions"
 
 	#add sudoers definitions for user neutron
 	insinto /etc/sudoers.d/