Add ARGS to nodepool service configuration
Expose more configuration options to the user. Change-Id: I7c112b23fecde9479a8b38b8996759072f375be9 Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
parent
aa5a476b6b
commit
e895743f78
@ -6,4 +6,7 @@
|
|||||||
# if you are using a virtualenv.
|
# if you are using a virtualenv.
|
||||||
PREFIX=/usr/local
|
PREFIX=/usr/local
|
||||||
|
|
||||||
|
# Options to pass to nodepoold.
|
||||||
|
ARGS="-l /etc/nodepool/logging.conf"
|
||||||
|
|
||||||
DIB_IMAGE_CACHE=/opt/nodepool/cache
|
DIB_IMAGE_CACHE=/opt/nodepool/cache
|
||||||
|
@ -6,4 +6,7 @@
|
|||||||
# value if you are using a virtualenv.
|
# value if you are using a virtualenv.
|
||||||
PREFIX=/usr/local
|
PREFIX=/usr/local
|
||||||
|
|
||||||
|
# Options to pass to nodepool-builder.
|
||||||
|
ARGS="-l /etc/nodepool/logging.conf"
|
||||||
|
|
||||||
DIB_IMAGE_CACHE=/opt/nodepool/cache
|
DIB_IMAGE_CACHE=/opt/nodepool/cache
|
||||||
|
@ -43,11 +43,10 @@ do_start()
|
|||||||
# 2 if daemon could not be started
|
# 2 if daemon could not be started
|
||||||
mkdir -p /var/run/$NAME
|
mkdir -p /var/run/$NAME
|
||||||
chown $USER /var/run/$NAME
|
chown $USER /var/run/$NAME
|
||||||
start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER --exec $DAEMON --test > /dev/null \
|
start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER \
|
||||||
|| return 1
|
--exec $DAEMON --test > /dev/null || return 1
|
||||||
start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER --exec $DAEMON -- \
|
start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER \
|
||||||
$DAEMON_ARGS \
|
--exec $DAEMON -- $ARGS || return 2
|
||||||
|| return 2
|
|
||||||
# Add code here, if necessary, that waits for the process to be ready
|
# Add code here, if necessary, that waits for the process to be ready
|
||||||
# to handle requests from services started subsequently which depend
|
# to handle requests from services started subsequently which depend
|
||||||
# on this one. As a last resort, sleep for some time.
|
# on this one. As a last resort, sleep for some time.
|
||||||
|
@ -43,11 +43,11 @@ do_start()
|
|||||||
# 2 if daemon could not be started
|
# 2 if daemon could not be started
|
||||||
mkdir -p /var/run/$NAME
|
mkdir -p /var/run/$NAME
|
||||||
chown $USER /var/run/$NAME
|
chown $USER /var/run/$NAME
|
||||||
start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER --exec $DAEMON --test > /dev/null \
|
chown $USER /var/run/$NAME
|
||||||
|| return 1
|
start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER \
|
||||||
start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER --exec $DAEMON -- \
|
--exec $DAEMON --test > /dev/null || return 1
|
||||||
$DAEMON_ARGS \
|
start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER \
|
||||||
|| return 2
|
--exec $DAEMON -- $ARGS || return 2
|
||||||
# Add code here, if necessary, that waits for the process to be ready
|
# Add code here, if necessary, that waits for the process to be ready
|
||||||
# to handle requests from services started subsequently which depend
|
# to handle requests from services started subsequently which depend
|
||||||
# on this one. As a last resort, sleep for some time.
|
# on this one. As a last resort, sleep for some time.
|
||||||
|
@ -6,4 +6,7 @@
|
|||||||
# if you are using a virtualenv.
|
# if you are using a virtualenv.
|
||||||
PREFIX=/usr
|
PREFIX=/usr
|
||||||
|
|
||||||
|
# Options to pass to nodepoold.
|
||||||
|
ARGS="-l /etc/nodepool/logging.conf"
|
||||||
|
|
||||||
DIB_IMAGE_CACHE=/opt/nodepool/cache
|
DIB_IMAGE_CACHE=/opt/nodepool/cache
|
||||||
|
@ -6,4 +6,7 @@
|
|||||||
# value if you are using a virtualenv.
|
# value if you are using a virtualenv.
|
||||||
PREFIX=/usr
|
PREFIX=/usr
|
||||||
|
|
||||||
|
# Options to pass to nodepool-builder.
|
||||||
|
ARGS="-l /etc/nodepool/logging.conf"
|
||||||
|
|
||||||
DIB_IMAGE_CACHE=/opt/nodepool/cache
|
DIB_IMAGE_CACHE=/opt/nodepool/cache
|
||||||
|
@ -7,7 +7,7 @@ Type=simple
|
|||||||
User=nodepool
|
User=nodepool
|
||||||
Group=nodepool
|
Group=nodepool
|
||||||
EnvironmentFile=-/etc/sysconfig/nodepool-builder
|
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]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=multi-user.target
|
||||||
|
@ -7,7 +7,7 @@ Type=simple
|
|||||||
User=nodepool
|
User=nodepool
|
||||||
Group=nodepool
|
Group=nodepool
|
||||||
EnvironmentFile=-/etc/sysconfig/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]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=multi-user.target
|
||||||
|
Loading…
Reference in New Issue
Block a user