Add statusbot to eavesdrop.o.o.
Change-Id: I3ae19a6321827b82ebf864182a1e5a90253b9c39 Reviewed-on: https://review.openstack.org/25755 Reviewed-by: Clark Boylan <clark.boylan@gmail.com> Approved: James E. Blair <corvus@inaugust.com> Tested-by: Jenkins
This commit is contained in:
James E. Blair
Jenkins
parent
106c5ae691
commit
6777d77355
@ -139,8 +139,16 @@ node 'planet.openstack.org' {
|
||||
|
||||
node 'eavesdrop.openstack.org' {
|
||||
class { 'openstack_project::eavesdrop':
|
||||
nickpass => hiera('openstack_meetbot_password'),
|
||||
sysadmins => hiera('sysadmins'),
|
||||
nickpass => hiera('openstack_meetbot_password'),
|
||||
sysadmins => hiera('sysadmins'),
|
||||
statusbot_nick => hiera('statusbot_nick'),
|
||||
statusbot_password => hiera('statusbot_nick_password'),
|
||||
statusbot_server => 'chat.freenode.net',
|
||||
statusbot_channels => 'openstack-infra',
|
||||
statusbot_wiki_user => hiera('statusbot_wiki_username'),
|
||||
statusbot_wiki_password => hiera('statusbot_wiki_password'),
|
||||
statusbot_wiki_url => 'https://wiki.openstack.org/w/api.php',
|
||||
statusbot_wiki_pageid => '1781',
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1,6 +1,14 @@
|
||||
class openstack_project::eavesdrop (
|
||||
$nickpass = '',
|
||||
$sysadmins = []
|
||||
$sysadmins = [],
|
||||
$statusbot_nick = '',
|
||||
$statusbot_password = '',
|
||||
$statusbot_server = '',
|
||||
$statusbot_channels = '',
|
||||
$statusbot_wiki_user = '',
|
||||
$statusbot_wiki_password = '',
|
||||
$statusbot_wiki_url = '',
|
||||
$statusbot_wiki_pageid = '',
|
||||
) {
|
||||
class { 'openstack_project::server':
|
||||
iptables_public_tcp_ports => [80],
|
||||
@ -16,6 +24,17 @@ class openstack_project::eavesdrop (
|
||||
channels => '#openstack #openstack-dev #openstack-meeting #openstack-meeting-alt',
|
||||
use_ssl => 'True'
|
||||
}
|
||||
|
||||
class { 'statusbot':
|
||||
nick => $statusbot_nick,
|
||||
password => $statusbot_password,
|
||||
server => $statusbot_server,
|
||||
channels => $statusbot_channels,
|
||||
wiki_user => $statusbot_wiki_user,
|
||||
wiki_password => $statusbot_wiki_password,
|
||||
wiki_url => $statusbot_wiki_url,
|
||||
wiki_pageid => $statusbot_wiki_pageid,
|
||||
}
|
||||
}
|
||||
|
||||
# vim:sw=2:ts=2:expandtab:textwidth=79
|
||||
|
||||
39
modules/statusbot/files/logging.config
Normal file
39
modules/statusbot/files/logging.config
Normal file
@ -0,0 +1,39 @@
|
||||
[loggers]
|
||||
keys=root,statusbot
|
||||
|
||||
[handlers]
|
||||
keys=console,debug,normal
|
||||
|
||||
[formatters]
|
||||
keys=simple
|
||||
|
||||
[logger_root]
|
||||
level=WARNING
|
||||
handlers=console
|
||||
|
||||
[logger_statusbot]
|
||||
level=DEBUG
|
||||
handlers=debug,normal
|
||||
qualname=statusbot
|
||||
|
||||
[handler_console]
|
||||
level=WARNING
|
||||
class=StreamHandler
|
||||
formatter=simple
|
||||
args=(sys.stdout,)
|
||||
|
||||
[handler_debug]
|
||||
level=DEBUG
|
||||
class=logging.handlers.TimedRotatingFileHandler
|
||||
formatter=simple
|
||||
args=('/var/log/statusbot/statusbot_debug.log', 'midnight', 1, 30,)
|
||||
|
||||
[handler_normal]
|
||||
level=INFO
|
||||
class=logging.handlers.TimedRotatingFileHandler
|
||||
formatter=simple
|
||||
args=('/var/log/statusbot/statusbot.log', 'midnight', 1, 30,)
|
||||
|
||||
[formatter_simple]
|
||||
format=%(asctime)s %(levelname)s %(name)s: %(message)s
|
||||
datefmt=
|
||||
149
modules/statusbot/files/statusbot.init
Executable file
149
modules/statusbot/files/statusbot.init
Executable file
@ -0,0 +1,149 @@
|
||||
#! /bin/sh
|
||||
### BEGIN INIT INFO
|
||||
# Provides: statusbot
|
||||
# Required-Start: $remote_fs $syslog
|
||||
# Required-Stop: $remote_fs $syslog
|
||||
# Default-Start: 2 3 4 5
|
||||
# Default-Stop: 0 1 6
|
||||
# Short-Description: Statis IRC Bot
|
||||
# Description: Update status page from IRC
|
||||
### END INIT INFO
|
||||
|
||||
# Author: James E. Blair <jeblair@openstack.org>
|
||||
|
||||
# Do NOT "set -e"
|
||||
|
||||
# PATH should only include /usr/* if it runs after the mountnfs.sh script
|
||||
PATH=/sbin:/usr/sbin:/bin:/usr/bin
|
||||
DESC="Statusbot"
|
||||
NAME=statusbot
|
||||
DAEMON=/usr/local/bin/$NAME
|
||||
DAEMON_ARGS="-c /etc/statusbot/statusbot.config"
|
||||
PIDFILE=/var/run/$NAME/$NAME.pid
|
||||
SCRIPTNAME=/etc/init.d/$NAME
|
||||
USER=statusbot
|
||||
|
||||
# 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
|
||||
|
||||
# Load the VERBOSE setting and other rcS variables
|
||||
. /lib/init/vars.sh
|
||||
|
||||
# Define LSB log_* functions.
|
||||
# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
|
||||
. /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
|
||||
|
||||
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
|
||||
# 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.
|
||||
}
|
||||
|
||||
#
|
||||
# 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 --signal 9 --pidfile $PIDFILE
|
||||
RETVAL="$?"
|
||||
[ "$RETVAL" = 2 ] && return 2
|
||||
rm -f /var/run/$NAME/*
|
||||
return "$RETVAL"
|
||||
}
|
||||
|
||||
#
|
||||
# Function that sends a SIGHUP to the daemon/service
|
||||
#
|
||||
do_reload() {
|
||||
#
|
||||
# If the daemon can reload its configuration without
|
||||
# restarting (for example, when it is sent a SIGHUP),
|
||||
# then implement that here.
|
||||
#
|
||||
start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
|
||||
return 0
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
|
||||
do_start
|
||||
case "$?" in
|
||||
0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
|
||||
2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
|
||||
esac
|
||||
;;
|
||||
stop)
|
||||
[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
|
||||
do_stop
|
||||
case "$?" in
|
||||
0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
|
||||
2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
|
||||
esac
|
||||
;;
|
||||
status)
|
||||
status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
|
||||
;;
|
||||
#reload|force-reload)
|
||||
#
|
||||
# If do_reload() is not implemented then leave this commented out
|
||||
# and leave 'force-reload' as an alias for 'restart'.
|
||||
#
|
||||
#log_daemon_msg "Reloading $DESC" "$NAME"
|
||||
#do_reload
|
||||
#log_end_msg $?
|
||||
#;;
|
||||
restart|force-reload)
|
||||
#
|
||||
# If the "reload" option is implemented then remove the
|
||||
# 'force-reload' alias
|
||||
#
|
||||
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|restart|reload|force-reload}" >&2
|
||||
echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
|
||||
exit 3
|
||||
;;
|
||||
esac
|
||||
|
||||
:
|
||||
101
modules/statusbot/manifests/init.pp
Normal file
101
modules/statusbot/manifests/init.pp
Normal file
@ -0,0 +1,101 @@
|
||||
# == Class: statusbot
|
||||
#
|
||||
class statusbot(
|
||||
$nick = '',
|
||||
$password = '',
|
||||
$server = '',
|
||||
$channels = '',
|
||||
$wiki_user = '',
|
||||
$wiki_password = '',
|
||||
$wiki_url = '',
|
||||
$wiki_pageid = '',
|
||||
) {
|
||||
|
||||
user { 'statusbot':
|
||||
ensure => present,
|
||||
home => '/home/statusbot',
|
||||
shell => '/bin/bash',
|
||||
gid => 'statusbot',
|
||||
managehome => true,
|
||||
require => Group['statusbot'],
|
||||
}
|
||||
|
||||
group { 'statusbot':
|
||||
ensure => present,
|
||||
}
|
||||
|
||||
vcsrepo { '/opt/statusbot':
|
||||
ensure => latest,
|
||||
provider => git,
|
||||
revision => 'master',
|
||||
source => 'https://github.com/openstack-infra/statusbot.git',
|
||||
}
|
||||
|
||||
exec { 'install_statusbot' :
|
||||
command => 'python setup.py install',
|
||||
cwd => '/opt/statusbot',
|
||||
path => '/bin:/usr/bin',
|
||||
refreshonly => true,
|
||||
subscribe => Vcsrepo['/opt/statusbot'],
|
||||
}
|
||||
|
||||
file { '/etc/init.d/statusbot':
|
||||
ensure => present,
|
||||
group => 'root',
|
||||
mode => '0555',
|
||||
owner => 'root',
|
||||
require => Vcsrepo['statusbot'],
|
||||
source => 'puppet:///modules/statusbot/statusbot.init',
|
||||
}
|
||||
|
||||
service { 'statusbot':
|
||||
ensure => running,
|
||||
enable => true,
|
||||
hasrestart => true,
|
||||
require => File['/etc/init.d/statusbot'],
|
||||
subscribe => [
|
||||
Vcsrepo['statusbot'],
|
||||
File['/etc/statusbot/statusbot.config'],
|
||||
],
|
||||
}
|
||||
|
||||
file { '/etc/statusbot':
|
||||
ensure => directory,
|
||||
}
|
||||
|
||||
file { '/var/log/statusbot':
|
||||
ensure => directory,
|
||||
group => 'statusbot',
|
||||
mode => '0775',
|
||||
owner => 'root',
|
||||
}
|
||||
|
||||
file { '/var/run/statusbot':
|
||||
ensure => directory,
|
||||
group => 'statusbot',
|
||||
mode => '0775',
|
||||
owner => 'root',
|
||||
}
|
||||
|
||||
file { '/etc/statusbot/logging.config':
|
||||
ensure => present,
|
||||
group => 'statusbot',
|
||||
mode => '0440',
|
||||
owner => 'root',
|
||||
replace => true,
|
||||
require => User['statusbot'],
|
||||
source => 'puppet:///modules/statusbot/logging.config',
|
||||
}
|
||||
|
||||
file { '/etc/statusbot/statusbot.config':
|
||||
ensure => present,
|
||||
content => template('statusbot/statusbot.config.erb'),
|
||||
group => 'statusbot',
|
||||
mode => '0440',
|
||||
owner => 'root',
|
||||
replace => true,
|
||||
require => User['statusbot'],
|
||||
}
|
||||
}
|
||||
|
||||
# vim:sw=2:ts=2:expandtab:textwidth=79
|
||||
14
modules/statusbot/templates/statusbot.config.erb
Normal file
14
modules/statusbot/templates/statusbot.config.erb
Normal file
@ -0,0 +1,14 @@
|
||||
[ircbot]
|
||||
nick=<%= nick %>
|
||||
pass=<%= password %>
|
||||
server=<%= server %>
|
||||
port=6667
|
||||
channels=<%= channels %>
|
||||
lockfile=/var/run/statusbot/statusbot.pid
|
||||
log_config=/etc/statusbot/logging.config
|
||||
|
||||
[wiki]
|
||||
username=<%= wiki_user %>
|
||||
password=<%= wiki_password %>
|
||||
url=<%= wiki_url %>
|
||||
pageid=<%= wiki_pageid %>
|
||||
Loading…
x
Reference in New Issue
Block a user