Move everything out of src and reorganize scripts.
Fixed up some scripts to be more robust. Changed the e2e test setup to use g1-small instances. Fixed up documentation to reflect the new script locations. Disabled the "curl | bash" cluster launch as it hasn't been well tested and doesn't include the cloudcfg tool yet.
This commit is contained in:
Joe Beda
4
cluster/saltbase/salt/etcd/etcd.conf
Executable file
4
cluster/saltbase/salt/etcd/etcd.conf
Executable file
@@ -0,0 +1,4 @@
|
||||
bind_addr = "0.0.0.0"
|
||||
peer_bind_addr = "0.0.0.0"
|
||||
data_dir = "/var/etcd"
|
||||
max_retry_attempts = 60
|
||||
63
cluster/saltbase/salt/etcd/init.sls
Executable file
63
cluster/saltbase/salt/etcd/init.sls
Executable file
@@ -0,0 +1,63 @@
|
||||
etcd-install:
|
||||
git.latest:
|
||||
- target: /var/src/etcd
|
||||
- name: git://github.com/coreos/etcd
|
||||
cmd.wait:
|
||||
- cwd: /var/src/etcd
|
||||
- names:
|
||||
- ./build
|
||||
- env:
|
||||
- PATH: {{ grains['path'] }}:/usr/local/bin
|
||||
- watch:
|
||||
- git: etcd-install
|
||||
file.symlink:
|
||||
- name: /usr/local/bin/etcd
|
||||
- target: /var/src/etcd/bin/etcd
|
||||
- watch:
|
||||
- cmd: etcd-install
|
||||
|
||||
etcd:
|
||||
group.present:
|
||||
- system: True
|
||||
user.present:
|
||||
- system: True
|
||||
- gid_from_name: True
|
||||
- shell: /sbin/nologin
|
||||
- home: /var/etcd
|
||||
- require:
|
||||
- group: etcd
|
||||
|
||||
/etc/etcd:
|
||||
file.directory:
|
||||
- user: root
|
||||
- group: root
|
||||
- dir_mode: 755
|
||||
|
||||
/etc/etcd/etcd.conf:
|
||||
file.managed:
|
||||
- source: salt://etcd/etcd.conf
|
||||
- user: root
|
||||
- group: root
|
||||
- mode: 644
|
||||
|
||||
/var/etcd:
|
||||
file.directory:
|
||||
- user: etcd
|
||||
- group: etcd
|
||||
- dir_mode: 700
|
||||
|
||||
/etc/init.d/etcd:
|
||||
file.managed:
|
||||
- source: salt://etcd/initd
|
||||
- user: root
|
||||
- group: root
|
||||
- mode: 755
|
||||
|
||||
etcd-service:
|
||||
service.running:
|
||||
- name: etcd
|
||||
- enable: True
|
||||
- watch:
|
||||
- file: /etc/etcd/etcd.conf
|
||||
- cmd: etcd-install
|
||||
|
||||
118
cluster/saltbase/salt/etcd/initd
Executable file
118
cluster/saltbase/salt/etcd/initd
Executable file
@@ -0,0 +1,118 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
### BEGIN INIT INFO
|
||||
# Provides: etcd
|
||||
# Required-Start: $local_fs $network $syslog
|
||||
# Required-Stop:
|
||||
# Default-Start: 2 3 4 5
|
||||
# Default-Stop: 0 1 6
|
||||
# Short-Description: The etcd key-value share configuration service.
|
||||
# Description: This launches and controls the etcd daemon.
|
||||
### END INIT INFO
|
||||
|
||||
|
||||
# PATH should only include /usr/* if it runs after the mountnfs.sh script
|
||||
PATH=/sbin:/usr/sbin:/bin:/usr/bin
|
||||
DESC="The etcd key-value share configuration service"
|
||||
NAME=etcd
|
||||
DAEMON=/usr/local/bin/$NAME
|
||||
DAEMON_ARGS="-peer-addr $HOSTNAME:7001 -name $HOSTNAME"
|
||||
DAEMON_LOG_FILE=/var/log/$NAME.log
|
||||
PIDFILE=/var/run/$NAME.pid
|
||||
SCRIPTNAME=/etc/init.d/$NAME
|
||||
DAEMON_USER=etcd
|
||||
|
||||
# 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
|
||||
|
||||
# Define LSB log_* functions.
|
||||
# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
|
||||
# and status_of_proc is working.
|
||||
. /lib/lsb/init-functions
|
||||
|
||||
#
|
||||
# Function that starts the daemon/service
|
||||
#
|
||||
do_start()
|
||||
{
|
||||
# Return
|
||||
# 0 if daemon has been started
|
||||
# 1 if daemon was already running
|
||||
# 2 if daemon could not be started
|
||||
start-stop-daemon --start --quiet --background --no-close \
|
||||
--make-pidfile --pidfile $PIDFILE \
|
||||
--exec $DAEMON -c $DAEMON_USER --test > /dev/null \
|
||||
|| return 1
|
||||
start-stop-daemon --start --quiet --background --no-close \
|
||||
--make-pidfile --pidfile $PIDFILE \
|
||||
--exec $DAEMON -c $DAEMON_USER -- \
|
||||
$DAEMON_ARGS >> $DAEMON_LOG_FILE 2>&1 \
|
||||
|| return 2
|
||||
}
|
||||
|
||||
#
|
||||
# Function that stops the daemon/service
|
||||
#
|
||||
do_stop()
|
||||
{
|
||||
# Return
|
||||
# 0 if daemon has been stopped
|
||||
# 1 if daemon was already stopped
|
||||
# 2 if daemon could not be stopped
|
||||
# other if a failure occurred
|
||||
start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
|
||||
RETVAL="$?"
|
||||
[ "$RETVAL" = 2 ] && return 2
|
||||
# Many daemons don't delete their pidfiles when they exit.
|
||||
rm -f $PIDFILE
|
||||
return "$RETVAL"
|
||||
}
|
||||
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
log_daemon_msg "Starting $DESC" "$NAME"
|
||||
do_start
|
||||
case "$?" in
|
||||
0|1) log_end_msg 0 || exit 0 ;;
|
||||
2) verblog_end_msg 1 || exit 1 ;;
|
||||
esac
|
||||
;;
|
||||
stop)
|
||||
log_daemon_msg "Stopping $DESC" "$NAME"
|
||||
do_stop
|
||||
case "$?" in
|
||||
0|1) log_end_msg 0 ;;
|
||||
2) exit 1 ;;
|
||||
esac
|
||||
;;
|
||||
status)
|
||||
status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
|
||||
;;
|
||||
|
||||
restart|force-reload)
|
||||
log_daemon_msg "Restarting $DESC" "$NAME"
|
||||
do_stop
|
||||
case "$?" in
|
||||
0|1)
|
||||
do_start
|
||||
case "$?" in
|
||||
0) log_end_msg 0 ;;
|
||||
1) log_end_msg 1 ;; # Old process is still running
|
||||
*) log_end_msg 1 ;; # Failed to start
|
||||
esac
|
||||
;;
|
||||
*)
|
||||
# Failed to stop
|
||||
log_end_msg 1
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
|
||||
exit 3
|
||||
;;
|
||||
esac
|
||||
Reference in New Issue
Block a user