Rename nodepoold to nodepool-launcher

The day has come to rename nodepoold to nodepool-launcher.

Change-Id: Ic04e3cf2dbdaf914bf8f92d073acb972380708f1
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2017-03-28 12:25:35 -04:00
parent e7590f11f6
commit fbe932e14f
8 changed files with 19 additions and 19 deletions

View File

@ -60,7 +60,7 @@ to contain your data):
export STATSD_HOST=127.0.0.1 export STATSD_HOST=127.0.0.1
export STATSD_PORT=8125 export STATSD_PORT=8125
nodepoold -d -c tools/fake.yaml nodepool-launcher -d -c tools/fake.yaml
All logging ends up in stdout. All logging ends up in stdout.

View File

@ -382,7 +382,7 @@ function start_nodepool {
export STATSD_PORT=8125 export STATSD_PORT=8125
run_process statsd "socat -u udp-recv:$STATSD_PORT -" run_process statsd "socat -u udp-recv:$STATSD_PORT -"
run_process nodepool "$NODEPOOL_INSTALL/bin/nodepoold -c $NODEPOOL_CONFIG -s $NODEPOOL_SECURE -l $NODEPOOL_LOGGING -d" run_process nodepool-launcher "$NODEPOOL_INSTALL/bin/nodepool-launcher -c $NODEPOOL_CONFIG -s $NODEPOOL_SECURE -l $NODEPOOL_LOGGING -d"
run_process nodepool-builder "$NODEPOOL_INSTALL/bin/nodepool-builder -c $NODEPOOL_CONFIG -l $NODEPOOL_LOGGING -d" run_process nodepool-builder "$NODEPOOL_INSTALL/bin/nodepool-builder -c $NODEPOOL_CONFIG -l $NODEPOOL_LOGGING -d"
: :
} }
@ -397,7 +397,7 @@ function cleanup_nodepool {
} }
# check for service enabled # check for service enabled
if is_service_enabled nodepool; then if is_service_enabled nodepool-launcher; then
if [[ "$1" == "stack" && "$2" == "install" ]]; then if [[ "$1" == "stack" && "$2" == "install" ]]; then
# Perform installation of service source # Perform installation of service source

View File

@ -24,5 +24,5 @@ GLEAN_REPO_REF=${GLEAN_REPO_REF:-master}
enable_service zookeeper enable_service zookeeper
enable_service geard enable_service geard
enable_service statsd enable_service statsd
enable_service nodepool enable_service nodepool-launcher
enable_service nodepool-builder enable_service nodepool-builder

View File

@ -316,7 +316,7 @@ Example::
Maximum number of node requests that this provider is allowed to handle Maximum number of node requests that this provider is allowed to handle
concurrently. The default, if not specified, is to have no maximum. Since concurrently. The default, if not specified, is to have no maximum. Since
each node request is handled by a separate thread, this can be useful for each node request is handled by a separate thread, this can be useful for
limiting the number of threads used by the nodepoold daemon. limiting the number of threads used by the nodepool-launcher daemon.
.. _pools: .. _pools:

View File

@ -5,7 +5,7 @@ Operation
Nodepool has two components which run as daemons. The Nodepool has two components which run as daemons. The
``nodepool-builder`` daemon is responsible for building diskimages and ``nodepool-builder`` daemon is responsible for building diskimages and
uploading them to providers, and the ``nodepoold`` daemon is uploading them to providers, and the ``nodepool-launcher`` daemon is
responsible for launching and deleting nodes. responsible for launching and deleting nodes.
Both daemons frequently re-read their configuration file after Both daemons frequently re-read their configuration file after
@ -31,14 +31,14 @@ safe, it is recommended to run a single instance of
only a single build thread (the default). only a single build thread (the default).
Nodepoold Nodepool-launcher
--------- -----------------
The main nodepool daemon is named ``nodepoold`` and is responsible for The main nodepool daemon is named ``nodepool-launcher`` and is
launching instances from the images created and uploaded by responsible for launching instances from the images created and
``nodepool-builder``. uploaded by ``nodepool-builder``.
When a new image is created and uploaded, ``nodepoold`` will When a new image is created and uploaded, ``nodepool-launcher`` will
immediately start using it when launching nodes (Nodepool always uses immediately start using it when launching nodes (Nodepool always uses
the most recent image for a given provider in the ``ready`` state). the most recent image for a given provider in the ``ready`` state).
Nodepool will delete images if they are not the most recent or second Nodepool will delete images if they are not the most recent or second
@ -51,9 +51,9 @@ using the previous image.
Daemon usage Daemon usage
------------ ------------
To start the main Nodepool daemon, run **nodepoold**: To start the main Nodepool daemon, run **nodepool-launcher**:
.. program-output:: nodepoold --help .. program-output:: nodepool-launcher --help
:nostderr: :nostderr:
To start the nodepool-builder daemon, run **nodepool--builder**: To start the nodepool-builder daemon, run **nodepool--builder**:

View File

@ -26,12 +26,12 @@ import nodepool.webapp
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
class NodePoolDaemon(nodepool.cmd.NodepoolDaemonApp): class NodePoolLauncherApp(nodepool.cmd.NodepoolDaemonApp):
app_name = 'nodepool' app_name = 'nodepool'
def create_parser(self): def create_parser(self):
parser = super(NodePoolDaemon, self).create_parser() parser = super(NodePoolLauncherApp, self).create_parser()
parser.add_argument('-c', dest='config', parser.add_argument('-c', dest='config',
default='/etc/nodepool/nodepool.yaml', default='/etc/nodepool/nodepool.yaml',
@ -72,7 +72,7 @@ class NodePoolDaemon(nodepool.cmd.NodepoolDaemonApp):
def main(): def main():
return NodePoolDaemon.main() return NodePoolLauncherApp.main()
if __name__ == "__main__": if __name__ == "__main__":

View File

@ -23,7 +23,7 @@ warnerrors = True
console_scripts = console_scripts =
nodepool = nodepool.cmd.nodepoolcmd:main nodepool = nodepool.cmd.nodepoolcmd:main
nodepool-builder = nodepool.cmd.builder:main nodepool-builder = nodepool.cmd.builder:main
nodepoold = nodepool.cmd.nodepoold:main nodepool-launcher = nodepool.cmd.launcher:main
[build_sphinx] [build_sphinx]
source-dir = doc/source source-dir = doc/source

View File

@ -8,4 +8,4 @@ mkdir -p /tmp/nodepool/log
export OS_CLIENT_CONFIG_FILE=`pwd`/clouds.yaml export OS_CLIENT_CONFIG_FILE=`pwd`/clouds.yaml
nodepool-builder -c `pwd`/nodepool.yaml -l `pwd`/builder-logging.conf -p /tmp/nodepool/builder.pid --fake nodepool-builder -c `pwd`/nodepool.yaml -l `pwd`/builder-logging.conf -p /tmp/nodepool/builder.pid --fake
nodepoold -c `pwd`/nodepool.yaml -s `pwd`/secure.conf -l `pwd`/launcher-logging.conf -p /tmp/nodepool/launcher.pid nodepool-launcher -c `pwd`/nodepool.yaml -s `pwd`/secure.conf -l `pwd`/launcher-logging.conf -p /tmp/nodepool/launcher.pid