Condense amphora-agent-ubuntu in to amphora-agent
This reverts commit fdde4e6984.
This was reverted due to an issue with starting the service on boot. A
trick of using symlinks was being attempted in order to refer to files
in the base source directory from an element. This seems to not work, so
copying init scripts in to the elments themselves.
Change-Id: If6ae07fa4ab4f39e2a339e17fbcc163b863ccd3a
This commit is contained in:
Gregory Haynes
parent
efd6aef662
commit
bce460e367
@ -1,3 +0,0 @@
|
||||
Element to install an Octavia Amphora agent.
|
||||
|
||||
|
||||
@ -1 +1 @@
|
||||
source-repositories
|
||||
amphora-agent
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
#!/bin/bash
|
||||
set -eux
|
||||
|
||||
install-packages libffi-dev libssl-dev
|
||||
cd /opt/amphora-agent/
|
||||
pip install -r requirements.txt
|
||||
python setup.py install
|
||||
cp etc/init/amphora-agent.conf /etc/init/
|
||||
mkdir /etc/octavia
|
||||
# we assume certs, etc will come in through the config drive
|
||||
mkdir /etc/octavia/certs
|
||||
mkdir /var/lib/octavia
|
||||
|
||||
@ -1,2 +0,0 @@
|
||||
# This is temporary until we have a pip package
|
||||
amphora-agent git /opt/amphora-agent https://git.openstack.org/openstack/octavia
|
||||
@ -1,2 +0,0 @@
|
||||
amphora-agent:
|
||||
default: amphora-agent
|
||||
@ -1 +0,0 @@
|
||||
etc/initd/amphora-agent
|
||||
67
elements/amphora-agent/init-scripts/sysv/amphora-agent
Normal file
67
elements/amphora-agent/init-scripts/sysv/amphora-agent
Normal file
@ -0,0 +1,67 @@
|
||||
### BEGIN INIT INFO
|
||||
# Provides: amphora-agent
|
||||
# Required-Start: $remote_fs $syslog $network
|
||||
# Required-Stop: $remote_fs $syslog $network
|
||||
# Default-Start: 2 3 4 5
|
||||
# Default-Stop: 0 1 6
|
||||
# Short-Description: Runs the Amphora Agent processes
|
||||
# Description: This script runs Octavia Amphora Agent processes.
|
||||
# This script will start the Amphora Agent services
|
||||
# and kill them.
|
||||
### END INIT INFO
|
||||
|
||||
# Using the lsb functions to perform the operations.
|
||||
. /lib/lsb/init-functions
|
||||
# Process name ( For display )
|
||||
NAME=amphora-agent
|
||||
# Daemon name, where is the actual executable
|
||||
DAEMON=/usr/local/bin/amphora-agent
|
||||
# pid file for the daemon
|
||||
PIDFILE=/var/run/amphora-agent.pid
|
||||
|
||||
# If the daemon is not there, then exit.
|
||||
test -x $DAEMON || exit 5
|
||||
|
||||
case $1 in
|
||||
start)
|
||||
# Checked the PID file exists and check the actual status of process
|
||||
if [ -e $PIDFILE ]; then
|
||||
status_of_proc -p $PIDFILE $DAEMON "$NAME process" && status="0" || status="$?"
|
||||
# If the status is SUCCESS then don't need to start again.
|
||||
if [ $status = "0" ]; then
|
||||
exit # Exit
|
||||
fi
|
||||
fi
|
||||
# Start the daemon.
|
||||
log_daemon_msg "Starting the process" "$NAME"
|
||||
# Start the daemon with the help of start-stop-daemon
|
||||
# Log the message appropriately
|
||||
if start-stop-daemon --start -m --quiet --oknodo --pidfile $PIDFILE --startas $DAEMON -- --config-file /etc/octavia/amphora-agent.conf ; then
|
||||
log_end_msg 0
|
||||
else
|
||||
log_end_msg 1
|
||||
fi
|
||||
;;
|
||||
stop)
|
||||
# Stop the daemon.
|
||||
if [ -e $PIDFILE ]; then
|
||||
status_of_proc -p $PIDFILE $DAEMON "Stoppping the $NAME process" && status="0" || status="$?"
|
||||
if [ "$status" = 0 ]; then
|
||||
start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE
|
||||
/bin/rm -rf $PIDFILE
|
||||
fi
|
||||
else
|
||||
log_daemon_msg "$NAME process is not running"
|
||||
log_end_msg 0
|
||||
fi
|
||||
;;
|
||||
restart)
|
||||
# Restart the daemon.
|
||||
$0 stop && sleep 2 && $0 start
|
||||
;;
|
||||
*)
|
||||
# For invalid arguments, print the usage message.
|
||||
echo "Usage: $0 {start|stop|restart|reload|status}"
|
||||
exit 2
|
||||
;;
|
||||
esac
|
||||
@ -1 +0,0 @@
|
||||
etc/init/amphora-agent.conf
|
||||
@ -0,0 +1,9 @@
|
||||
description "Start up the Octavia Amphora Agent"
|
||||
|
||||
start on runlevel [2345]
|
||||
stop on runlevel [!2345]
|
||||
|
||||
respawn
|
||||
respawn limit 2 2
|
||||
|
||||
exec amphora-agent --config-file /etc/octavia/amphora-agent.conf
|
||||
@ -1,9 +0,0 @@
|
||||
description "Start up the Octavia Amphora Agent"
|
||||
|
||||
start on runlevel [2345]
|
||||
stop on runlevel [!2345]
|
||||
|
||||
respawn
|
||||
respawn limit 2 2
|
||||
|
||||
exec amphora-agent --config-file /etc/octavia/amphora-agent.conf
|
||||
@ -1,67 +0,0 @@
|
||||
### BEGIN INIT INFO
|
||||
# Provides: amphora-agent
|
||||
# Required-Start: $remote_fs $syslog $network
|
||||
# Required-Stop: $remote_fs $syslog $network
|
||||
# Default-Start: 2 3 4 5
|
||||
# Default-Stop: 0 1 6
|
||||
# Short-Description: Runs the Amphora Agent processes
|
||||
# Description: This script runs Octavia Amphora Agent processes.
|
||||
# This script will start the Amphora Agent services
|
||||
# and kill them.
|
||||
### END INIT INFO
|
||||
|
||||
# Using the lsb functions to perform the operations.
|
||||
. /lib/lsb/init-functions
|
||||
# Process name ( For display )
|
||||
NAME=amphora-agent
|
||||
# Daemon name, where is the actual executable
|
||||
DAEMON=/usr/local/bin/amphora-agent
|
||||
# pid file for the daemon
|
||||
PIDFILE=/var/run/amphora-agent.pid
|
||||
|
||||
# If the daemon is not there, then exit.
|
||||
test -x $DAEMON || exit 5
|
||||
|
||||
case $1 in
|
||||
start)
|
||||
# Checked the PID file exists and check the actual status of process
|
||||
if [ -e $PIDFILE ]; then
|
||||
status_of_proc -p $PIDFILE $DAEMON "$NAME process" && status="0" || status="$?"
|
||||
# If the status is SUCCESS then don't need to start again.
|
||||
if [ $status = "0" ]; then
|
||||
exit # Exit
|
||||
fi
|
||||
fi
|
||||
# Start the daemon.
|
||||
log_daemon_msg "Starting the process" "$NAME"
|
||||
# Start the daemon with the help of start-stop-daemon
|
||||
# Log the message appropriately
|
||||
if start-stop-daemon --start -m --quiet --oknodo --pidfile $PIDFILE --startas $DAEMON -- --config-file /etc/octavia/amphora-agent.conf ; then
|
||||
log_end_msg 0
|
||||
else
|
||||
log_end_msg 1
|
||||
fi
|
||||
;;
|
||||
stop)
|
||||
# Stop the daemon.
|
||||
if [ -e $PIDFILE ]; then
|
||||
status_of_proc -p $PIDFILE $DAEMON "Stoppping the $NAME process" && status="0" || status="$?"
|
||||
if [ "$status" = 0 ]; then
|
||||
start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE
|
||||
/bin/rm -rf $PIDFILE
|
||||
fi
|
||||
else
|
||||
log_daemon_msg "$NAME process is not running"
|
||||
log_end_msg 0
|
||||
fi
|
||||
;;
|
||||
restart)
|
||||
# Restart the daemon.
|
||||
$0 stop && sleep 2 && $0 start
|
||||
;;
|
||||
*)
|
||||
# For invalid arguments, print the usage message.
|
||||
echo "Usage: $0 {start|stop|restart|reload|status}"
|
||||
exit 2
|
||||
;;
|
||||
esac
|
||||
Loading…
Reference in New Issue
Block a user