Merge "Add PREFIX to nodepool service"

files/etc/default/nodepool

@@ -2,4 +2,8 @@
 #  DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
 #
 
+# The prefix used when nodepool was installed. Be sure to update this value
+# if you are using a virtualenv.
+PREFIX=/usr
+
 DIB_IMAGE_CACHE=/opt/nodepool/cache

files/etc/default/nodepool-builder

@@ -2,4 +2,8 @@
 #  DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
 #
 
+# The prefix used when nodepool-builder was installed. Be sure to update this
+# value if you are using a virtualenv.
+PREFIX=/usr
+
 DIB_IMAGE_CACHE=/opt/nodepool/cache

files/etc/init.d/nodepool

@@ -13,17 +13,18 @@
 PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin
 DESC="Nodepool"
 NAME=nodepool
-DAEMON=/usr/local/bin/nodepoold
 PIDFILE=/var/run/$NAME/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
 USER=nodepool
 
-# Exit if the package is not installed
-[ -x "$DAEMON" ] || exit 0
-
 # Read configuration variable file if it is present
 [ -r /etc/default/$NAME ] && . /etc/default/$NAME
 
+DAEMON=$PREFIX/bin/nodepoold
+
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 0
+
 # Load the VERBOSE setting and other rcS variables
 . /lib/init/vars.sh
 

files/etc/init.d/nodepool-builder

@@ -13,17 +13,18 @@
 PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin
 DESC="Nodepool Builder"
 NAME=nodepool-builder
-DAEMON=/usr/local/bin/nodepool-builder
 PIDFILE=/var/run/$NAME/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
 USER=nodepool
 
-# Exit if the package is not installed
-[ -x "$DAEMON" ] || exit 0
-
 # Read configuration variable file if it is present
 [ -r /etc/default/$NAME ] && . /etc/default/$NAME
 
+DAEMON=$PREFIX/bin/nodepool-builder
+
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 0
+
 # Load the VERBOSE setting and other rcS variables
 . /lib/init/vars.sh
 

files/etc/sysconfig/nodepool

@@ -2,4 +2,8 @@
 #  DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
 #
 
+# The prefix used when nodepool was installed. Be sure to update this value
+# if you are using a virtualenv.
+PREFIX=/usr
+
 DIB_IMAGE_CACHE=/opt/nodepool/cache

files/etc/sysconfig/nodepool-builder

@@ -2,4 +2,8 @@
 #  DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
 #
 
+# The prefix used when nodepool-builder was installed. Be sure to update this
+# value if you are using a virtualenv.
+PREFIX=/usr
+
 DIB_IMAGE_CACHE=/opt/nodepool/cache

files/etc/systemd/system/nodepool-builder.service

@@ -7,7 +7,7 @@ Type=simple
 User=nodepool
 Group=nodepool
 EnvironmentFile=-/etc/sysconfig/nodepool-builder
-ExecStart=/usr/bin/nodepool-builder -d -l /etc/nodepool/logging.conf
+ExecStart=/bin/sh -c "${PREFIX}/bin/nodepool-builder -d -l /etc/nodepool/logging.conf"
 
 [Install]
 WantedBy=multi-user.target

files/etc/systemd/system/nodepool.service

@@ -7,7 +7,7 @@ Type=simple
 User=nodepool
 Group=nodepool
 EnvironmentFile=-/etc/sysconfig/nodepool
-ExecStart=/usr/bin/nodepoold --no-builder -d -l /etc/nodepool/logging.conf
+ExecStart=/bin/sh -c "${PREFIX}/bin/nodepoold --no-builder -d -l /etc/nodepool/logging.conf"
 
 [Install]
 WantedBy=multi-user.target