From e895743f78d0a704ee059304e33557ce3fc8e94c Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Sat, 10 Sep 2016 19:35:21 -0400
Subject: [PATCH] Add ARGS to nodepool service configuration

Expose more configuration options to the user.

Change-Id: I7c112b23fecde9479a8b38b8996759072f375be9
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 files/etc/default/nodepool                        |  3 +++
 files/etc/default/nodepool-builder                |  3 +++
 files/etc/init.d/nodepool                         |  9 ++++-----
 files/etc/init.d/nodepool-builder                 | 10 +++++-----
 files/etc/sysconfig/nodepool                      |  3 +++
 files/etc/sysconfig/nodepool-builder              |  3 +++
 files/etc/systemd/system/nodepool-builder.service |  2 +-
 files/etc/systemd/system/nodepool.service         |  2 +-
 8 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/files/etc/default/nodepool b/files/etc/default/nodepool
index 8541bd8..33f3656 100644
--- a/files/etc/default/nodepool
+++ b/files/etc/default/nodepool
@@ -6,4 +6,7 @@
 # if you are using a virtualenv.
 PREFIX=/usr/local
 
+# Options to pass to nodepoold.
+ARGS="-l /etc/nodepool/logging.conf"
+
 DIB_IMAGE_CACHE=/opt/nodepool/cache
diff --git a/files/etc/default/nodepool-builder b/files/etc/default/nodepool-builder
index 0ac4d7e..3f03756 100644
--- a/files/etc/default/nodepool-builder
+++ b/files/etc/default/nodepool-builder
@@ -6,4 +6,7 @@
 # value if you are using a virtualenv.
 PREFIX=/usr/local
 
+# Options to pass to nodepool-builder.
+ARGS="-l /etc/nodepool/logging.conf"
+
 DIB_IMAGE_CACHE=/opt/nodepool/cache
diff --git a/files/etc/init.d/nodepool b/files/etc/init.d/nodepool
index a95b5d6..3fb9a4a 100644
--- a/files/etc/init.d/nodepool
+++ b/files/etc/init.d/nodepool
@@ -43,11 +43,10 @@ do_start()
     #   2 if daemon could not be started
     mkdir -p /var/run/$NAME
     chown $USER /var/run/$NAME
-    start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER --exec $DAEMON --test > /dev/null \
-        || return 1
-    start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER --exec $DAEMON -- \
-        $DAEMON_ARGS \
-        || return 2
+    start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER \
+        --exec $DAEMON --test > /dev/null || return 1
+    start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER \
+        --exec $DAEMON -- $ARGS || return 2
     # Add code here, if necessary, that waits for the process to be ready
     # to handle requests from services started subsequently which depend
     # on this one.  As a last resort, sleep for some time.
diff --git a/files/etc/init.d/nodepool-builder b/files/etc/init.d/nodepool-builder
index 6d43403..765395c 100644
--- a/files/etc/init.d/nodepool-builder
+++ b/files/etc/init.d/nodepool-builder
@@ -43,11 +43,11 @@ do_start()
     #   2 if daemon could not be started
     mkdir -p /var/run/$NAME
     chown $USER /var/run/$NAME
-    start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER --exec $DAEMON --test > /dev/null \
-        || return 1
-    start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER --exec $DAEMON -- \
-        $DAEMON_ARGS \
-        || return 2
+    chown $USER /var/run/$NAME
+    start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER \
+        --exec $DAEMON --test > /dev/null || return 1
+    start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER \
+        --exec $DAEMON -- $ARGS || return 2
     # Add code here, if necessary, that waits for the process to be ready
     # to handle requests from services started subsequently which depend
     # on this one.  As a last resort, sleep for some time.
diff --git a/files/etc/sysconfig/nodepool b/files/etc/sysconfig/nodepool
index f7d70be..a9a40c7 100644
--- a/files/etc/sysconfig/nodepool
+++ b/files/etc/sysconfig/nodepool
@@ -6,4 +6,7 @@
 # if you are using a virtualenv.
 PREFIX=/usr
 
+# Options to pass to nodepoold.
+ARGS="-l /etc/nodepool/logging.conf"
+
 DIB_IMAGE_CACHE=/opt/nodepool/cache
diff --git a/files/etc/sysconfig/nodepool-builder b/files/etc/sysconfig/nodepool-builder
index 9a601d2..650bf77 100644
--- a/files/etc/sysconfig/nodepool-builder
+++ b/files/etc/sysconfig/nodepool-builder
@@ -6,4 +6,7 @@
 # value if you are using a virtualenv.
 PREFIX=/usr
 
+# Options to pass to nodepool-builder.
+ARGS="-l /etc/nodepool/logging.conf"
+
 DIB_IMAGE_CACHE=/opt/nodepool/cache
diff --git a/files/etc/systemd/system/nodepool-builder.service b/files/etc/systemd/system/nodepool-builder.service
index 8c8801a..a9eb5b7 100644
--- a/files/etc/systemd/system/nodepool-builder.service
+++ b/files/etc/systemd/system/nodepool-builder.service
@@ -7,7 +7,7 @@ Type=simple
 User=nodepool
 Group=nodepool
 EnvironmentFile=-/etc/sysconfig/nodepool-builder
-ExecStart=/bin/sh -c "${PREFIX}/bin/nodepool-builder -d -l /etc/nodepool/logging.conf"
+ExecStart=/bin/sh -c "${PREFIX}/bin/nodepool-builder -d ${ARGS}"
 
 [Install]
 WantedBy=multi-user.target
diff --git a/files/etc/systemd/system/nodepool.service b/files/etc/systemd/system/nodepool.service
index 0c851d9..4e318ce 100644
--- a/files/etc/systemd/system/nodepool.service
+++ b/files/etc/systemd/system/nodepool.service
@@ -7,7 +7,7 @@ Type=simple
 User=nodepool
 Group=nodepool
 EnvironmentFile=-/etc/sysconfig/nodepool
-ExecStart=/bin/sh -c "${PREFIX}/bin/nodepoold --no-builder -d -l /etc/nodepool/logging.conf"
+ExecStart=/bin/sh -c "${PREFIX}/bin/nodepoold -d --no-builder ${ARGS}"
 
 [Install]
 WantedBy=multi-user.target