Split out zuul module
The spec: http://specs.openstack.org/openstack-infra/infra-specs/specs/puppet-modules.html This patch does not depend on a second patch to add zuul project, because the project has been added earlier. See related I926162406cbe44027a1f653f1bb2da04d58ef08f Change-Id: I3e82d272d9985506e59ab8b56a8e8ae746900056
This commit is contained in:
Mikhail S Medvedev
parent
570abf2dce
commit
b778ddc90b
@ -58,6 +58,7 @@ SOURCE_MODULES["https://github.com/puppet-community/puppet-module-puppetboard"]=
|
||||
# Add modules that should be part of the openstack-infra integration test here
|
||||
INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-elasticsearch"]="origin/master"
|
||||
INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-storyboard"]="origin/master"
|
||||
INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-zuul"]="origin/master"
|
||||
INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-kibana"]="origin/master"
|
||||
INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-lodgeit"]="origin/master"
|
||||
INTEGRATION_MODULES["https://git.openstack.org/openstack-infra/puppet-jenkins"]="origin/master"
|
||||
|
||||
@ -1,134 +0,0 @@
|
||||
#! /bin/sh
|
||||
### BEGIN INIT INFO
|
||||
# Provides: zuul
|
||||
# Required-Start: $remote_fs $syslog
|
||||
# Required-Stop: $remote_fs $syslog
|
||||
# Default-Start: 2 3 4 5
|
||||
# Default-Stop: 0 1 6
|
||||
# Short-Description: Zuul
|
||||
# Description: Trunk gating system merger
|
||||
### END INIT INFO
|
||||
|
||||
# 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="Zuul Merger"
|
||||
NAME=zuul-merger
|
||||
DAEMON=/usr/local/bin/zuul-merger
|
||||
PIDFILE=/var/run/$NAME/$NAME.pid
|
||||
SCRIPTNAME=/etc/init.d/$NAME
|
||||
USER=zuul
|
||||
|
||||
# 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
|
||||
ulimit -n 8192
|
||||
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 zuul-merger
|
||||
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)
|
||||
#
|
||||
# If the "reload" option is implemented then remove the
|
||||
# 'force-reload' alias
|
||||
#
|
||||
log_daemon_msg "Restarting $DESC" "$NAME"
|
||||
do_stop
|
||||
do_start
|
||||
;;
|
||||
*)
|
||||
#echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
|
||||
echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
|
||||
exit 3
|
||||
;;
|
||||
esac
|
||||
|
||||
:
|
||||
@ -1,159 +0,0 @@
|
||||
#! /bin/sh
|
||||
### BEGIN INIT INFO
|
||||
# Provides: zuul
|
||||
# Required-Start: $remote_fs $syslog
|
||||
# Required-Stop: $remote_fs $syslog
|
||||
# Default-Start: 2 3 4 5
|
||||
# Default-Stop: 0 1 6
|
||||
# Short-Description: Zuul
|
||||
# Description: Trunk gating system
|
||||
### END INIT INFO
|
||||
|
||||
# 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="Zuul"
|
||||
NAME=zuul
|
||||
DAEMON=/usr/local/bin/zuul-server
|
||||
PIDFILE=/var/run/$NAME/$NAME.pid
|
||||
SCRIPTNAME=/etc/init.d/$NAME
|
||||
USER=zuul
|
||||
|
||||
# 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
|
||||
ulimit -n 8192
|
||||
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 stops the daemon/service
|
||||
#
|
||||
do_graceful_stop()
|
||||
{
|
||||
PID=`cat $PIDFILE`
|
||||
kill -USR1 $PID
|
||||
|
||||
# wait until really stopped
|
||||
if [ -n "${PID:-}" ]; then
|
||||
i=0
|
||||
while kill -0 "${PID:-}" 2> /dev/null; do
|
||||
if [ $i -eq '0' ]; then
|
||||
echo -n " ... waiting "
|
||||
else
|
||||
echo -n "."
|
||||
fi
|
||||
i=$(($i+1))
|
||||
sleep 1
|
||||
done
|
||||
fi
|
||||
|
||||
rm -f /var/run/$NAME/*
|
||||
}
|
||||
|
||||
#
|
||||
# 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 zuul-server
|
||||
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)
|
||||
#
|
||||
# If the "reload" option is implemented then remove the
|
||||
# 'force-reload' alias
|
||||
#
|
||||
log_daemon_msg "Restarting $DESC" "$NAME"
|
||||
do_graceful_stop
|
||||
do_start
|
||||
;;
|
||||
*)
|
||||
#echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
|
||||
echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
|
||||
exit 3
|
||||
;;
|
||||
esac
|
||||
|
||||
:
|
||||
@ -1,368 +0,0 @@
|
||||
# Copyright 2012-2013 Hewlett-Packard Development Company, L.P.
|
||||
# Copyright 2012 Antoine "hashar" Musso
|
||||
# Copyright 2012 Wikimedia Foundation Inc.
|
||||
# Copyright 2013 OpenStack Foundation
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
# == Class: zuul
|
||||
#
|
||||
class zuul (
|
||||
$vhost_name = $::fqdn,
|
||||
$serveradmin = "webmaster@${::fqdn}",
|
||||
$gearman_server = '127.0.0.1',
|
||||
$internal_gearman = true,
|
||||
$gerrit_server = '',
|
||||
$gerrit_user = '',
|
||||
$gerrit_baseurl = '',
|
||||
$zuul_ssh_private_key = '',
|
||||
$url_pattern = '',
|
||||
$status_url = "https://${::fqdn}/",
|
||||
$zuul_url = '',
|
||||
$git_source_repo = 'https://git.openstack.org/openstack-infra/zuul',
|
||||
$job_name_in_report = false,
|
||||
$revision = 'master',
|
||||
$statsd_host = '',
|
||||
$git_email = '',
|
||||
$git_name = '',
|
||||
$smtp_host = 'localhost',
|
||||
$smtp_port = 25,
|
||||
$smtp_default_from = "zuul@${::fqdn}",
|
||||
$smtp_default_to = "zuul.reports@${::fqdn}",
|
||||
$swift_authurl = '',
|
||||
$swift_auth_version = '',
|
||||
$swift_user = '',
|
||||
$swift_key = '',
|
||||
$swift_tenant_name = '',
|
||||
$swift_region_name = '',
|
||||
$swift_default_container = '',
|
||||
$swift_default_logserver_prefix = '',
|
||||
) {
|
||||
include apache
|
||||
include pip
|
||||
|
||||
$packages = [
|
||||
'gcc', # yappi requires this to build
|
||||
'python-lockfile',
|
||||
'python-paste',
|
||||
'python-webob',
|
||||
]
|
||||
|
||||
package { $packages:
|
||||
ensure => present,
|
||||
}
|
||||
|
||||
package { 'yappi':
|
||||
ensure => present,
|
||||
provider => pip,
|
||||
require => Class['pip'],
|
||||
}
|
||||
|
||||
# needed by python-keystoneclient, has system bindings
|
||||
# Zuul and Nodepool both need it, so make it conditional
|
||||
if ! defined(Package['python-lxml']) {
|
||||
package { 'python-lxml':
|
||||
ensure => present,
|
||||
}
|
||||
}
|
||||
|
||||
# A lot of things need yaml, be conservative requiring this package to avoid
|
||||
# conflicts with other modules.
|
||||
if ! defined(Package['python-yaml']) {
|
||||
package { 'python-yaml':
|
||||
ensure => present,
|
||||
}
|
||||
}
|
||||
|
||||
if ! defined(Package['python-paramiko']) {
|
||||
package { 'python-paramiko':
|
||||
ensure => present,
|
||||
}
|
||||
}
|
||||
|
||||
if ! defined(Package['python-daemon']) {
|
||||
package { 'python-daemon':
|
||||
ensure => present,
|
||||
}
|
||||
}
|
||||
|
||||
if ! defined(Package['yui-compressor']) {
|
||||
package { 'yui-compressor':
|
||||
ensure => present,
|
||||
}
|
||||
}
|
||||
|
||||
user { 'zuul':
|
||||
ensure => present,
|
||||
home => '/home/zuul',
|
||||
shell => '/bin/bash',
|
||||
gid => 'zuul',
|
||||
managehome => true,
|
||||
require => Group['zuul'],
|
||||
}
|
||||
|
||||
group { 'zuul':
|
||||
ensure => present,
|
||||
}
|
||||
|
||||
vcsrepo { '/opt/zuul':
|
||||
ensure => latest,
|
||||
provider => git,
|
||||
revision => $revision,
|
||||
source => $git_source_repo,
|
||||
}
|
||||
|
||||
exec { 'install_zuul' :
|
||||
command => 'pip install /opt/zuul',
|
||||
path => '/usr/local/bin:/usr/bin:/bin/',
|
||||
refreshonly => true,
|
||||
subscribe => Vcsrepo['/opt/zuul'],
|
||||
require => [
|
||||
Class['pip'],
|
||||
Package['gcc'],
|
||||
Package['python-daemon'],
|
||||
Package['python-lockfile'],
|
||||
Package['python-lxml'],
|
||||
Package['python-paramiko'],
|
||||
Package['python-paste'],
|
||||
Package['python-webob'],
|
||||
Package['python-yaml'],
|
||||
Package['yappi'],
|
||||
Package['yui-compressor'],
|
||||
],
|
||||
}
|
||||
|
||||
file { '/etc/zuul':
|
||||
ensure => directory,
|
||||
}
|
||||
|
||||
# TODO: We should put in notify either Service['zuul'] or Exec['zuul-reload']
|
||||
# at some point, but that still has some problems.
|
||||
file { '/etc/zuul/zuul.conf':
|
||||
ensure => present,
|
||||
owner => 'zuul',
|
||||
mode => '0400',
|
||||
content => template('zuul/zuul.conf.erb'),
|
||||
require => [
|
||||
File['/etc/zuul'],
|
||||
User['zuul'],
|
||||
],
|
||||
}
|
||||
|
||||
file { '/etc/default/zuul':
|
||||
ensure => present,
|
||||
mode => '0444',
|
||||
content => template('zuul/zuul.default.erb'),
|
||||
}
|
||||
|
||||
file { '/var/log/zuul':
|
||||
ensure => directory,
|
||||
owner => 'zuul',
|
||||
require => User['zuul'],
|
||||
}
|
||||
|
||||
file { '/var/run/zuul':
|
||||
ensure => directory,
|
||||
owner => 'zuul',
|
||||
group => 'zuul',
|
||||
require => User['zuul'],
|
||||
}
|
||||
|
||||
file { '/var/run/zuul-merger':
|
||||
ensure => directory,
|
||||
owner => 'zuul',
|
||||
group => 'zuul',
|
||||
require => User['zuul'],
|
||||
}
|
||||
|
||||
file { '/var/lib/zuul':
|
||||
ensure => directory,
|
||||
owner => 'zuul',
|
||||
group => 'zuul',
|
||||
}
|
||||
|
||||
file { '/var/lib/zuul/git':
|
||||
ensure => directory,
|
||||
owner => 'zuul',
|
||||
require => File['/var/lib/zuul'],
|
||||
}
|
||||
|
||||
file { '/var/lib/zuul/ssh':
|
||||
ensure => directory,
|
||||
owner => 'zuul',
|
||||
group => 'zuul',
|
||||
mode => '0500',
|
||||
require => File['/var/lib/zuul'],
|
||||
}
|
||||
|
||||
file { '/var/lib/zuul/ssh/id_rsa':
|
||||
owner => 'zuul',
|
||||
group => 'zuul',
|
||||
mode => '0400',
|
||||
require => File['/var/lib/zuul/ssh'],
|
||||
content => $zuul_ssh_private_key,
|
||||
}
|
||||
|
||||
file { '/var/lib/zuul/www':
|
||||
ensure => directory,
|
||||
require => File['/var/lib/zuul'],
|
||||
}
|
||||
|
||||
package { 'libjs-jquery':
|
||||
ensure => present,
|
||||
}
|
||||
|
||||
file { '/var/lib/zuul/www/jquery.min.js':
|
||||
ensure => link,
|
||||
target => '/usr/share/javascript/jquery/jquery.min.js',
|
||||
require => [File['/var/lib/zuul/www'],
|
||||
Package['libjs-jquery']],
|
||||
}
|
||||
|
||||
vcsrepo { '/opt/twitter-bootstrap':
|
||||
ensure => latest,
|
||||
provider => git,
|
||||
revision => 'v3.1.1',
|
||||
source => 'https://github.com/twbs/bootstrap.git',
|
||||
}
|
||||
|
||||
file { '/var/lib/zuul/www/bootstrap':
|
||||
ensure => link,
|
||||
target => '/opt/twitter-bootstrap/dist',
|
||||
require => [File['/var/lib/zuul/www'],
|
||||
Package['libjs-jquery'],
|
||||
Vcsrepo['/opt/twitter-bootstrap']],
|
||||
}
|
||||
|
||||
vcsrepo { '/opt/jquery-visibility':
|
||||
ensure => latest,
|
||||
provider => git,
|
||||
revision => 'master',
|
||||
source => 'https://github.com/mathiasbynens/jquery-visibility.git',
|
||||
}
|
||||
|
||||
exec { 'install-jquery-visibility':
|
||||
command => 'yui-compressor -o /var/lib/zuul/www/jquery-visibility.min.js /opt/jquery-visibility/jquery-visibility.js',
|
||||
path => 'bin:/usr/bin',
|
||||
refreshonly => true,
|
||||
subscribe => Vcsrepo['/opt/jquery-visibility'],
|
||||
require => [File['/var/lib/zuul/www'],
|
||||
Package['yui-compressor'],
|
||||
Vcsrepo['/opt/jquery-visibility']],
|
||||
}
|
||||
|
||||
vcsrepo { '/opt/graphitejs':
|
||||
ensure => latest,
|
||||
provider => git,
|
||||
revision => 'master',
|
||||
source => 'https://github.com/prestontimmons/graphitejs.git',
|
||||
}
|
||||
|
||||
file { '/var/lib/zuul/www/jquery.graphite.js':
|
||||
ensure => link,
|
||||
target => '/opt/graphitejs/jquery.graphite.js',
|
||||
require => [File['/var/lib/zuul/www'],
|
||||
Vcsrepo['/opt/graphitejs']],
|
||||
}
|
||||
|
||||
file { '/var/lib/zuul/www/index.html':
|
||||
ensure => link,
|
||||
target => '/opt/zuul/etc/status/public_html/index.html',
|
||||
require => File['/var/lib/zuul/www'],
|
||||
}
|
||||
|
||||
file { '/var/lib/zuul/www/styles':
|
||||
ensure => link,
|
||||
target => '/opt/zuul/etc/status/public_html/styles',
|
||||
require => File['/var/lib/zuul/www'],
|
||||
}
|
||||
|
||||
file { '/var/lib/zuul/www/zuul.app.js':
|
||||
ensure => link,
|
||||
target => '/opt/zuul/etc/status/public_html/zuul.app.js',
|
||||
require => File['/var/lib/zuul/www'],
|
||||
}
|
||||
|
||||
file { '/var/lib/zuul/www/jquery.zuul.js':
|
||||
ensure => link,
|
||||
target => '/opt/zuul/etc/status/public_html/jquery.zuul.js',
|
||||
require => File['/var/lib/zuul/www'],
|
||||
}
|
||||
|
||||
file { '/var/lib/zuul/www/images':
|
||||
ensure => link,
|
||||
target => '/opt/zuul/etc/status/public_html/images',
|
||||
require => File['/var/lib/zuul/www'],
|
||||
}
|
||||
|
||||
file { '/etc/init.d/zuul':
|
||||
ensure => present,
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0555',
|
||||
source => 'puppet:///modules/zuul/zuul.init',
|
||||
}
|
||||
|
||||
file { '/etc/init.d/zuul-merger':
|
||||
ensure => present,
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0555',
|
||||
source => 'puppet:///modules/zuul/zuul-merger.init',
|
||||
}
|
||||
|
||||
apache::vhost { $vhost_name:
|
||||
port => 443,
|
||||
docroot => 'MEANINGLESS ARGUMENT',
|
||||
priority => '50',
|
||||
template => 'zuul/zuul.vhost.erb',
|
||||
}
|
||||
if ! defined(A2mod['rewrite']) {
|
||||
a2mod { 'rewrite':
|
||||
ensure => present,
|
||||
}
|
||||
}
|
||||
if ! defined(A2mod['proxy']) {
|
||||
a2mod { 'proxy':
|
||||
ensure => present,
|
||||
}
|
||||
}
|
||||
if ! defined(A2mod['proxy_http']) {
|
||||
a2mod { 'proxy_http':
|
||||
ensure => present,
|
||||
}
|
||||
}
|
||||
if ! defined(A2mod['cache']) {
|
||||
a2mod { 'cache':
|
||||
ensure => present,
|
||||
}
|
||||
}
|
||||
|
||||
case $::lsbdistcodename {
|
||||
'precise': {
|
||||
if ! defined(A2mod['mem_cache']) {
|
||||
a2mod { 'mem_cache':
|
||||
ensure => present,
|
||||
}
|
||||
}
|
||||
}
|
||||
default: {
|
||||
if ! defined(A2mod['cache_disk']) {
|
||||
a2mod { 'cache_disk':
|
||||
ensure => present,
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,60 +0,0 @@
|
||||
# Copyright 2012-2013 Hewlett-Packard Development Company, L.P.
|
||||
# Copyright 2014 OpenStack Foundation
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
# == Class: zuul::merger
|
||||
#
|
||||
class zuul::merger (
|
||||
) {
|
||||
service { 'zuul-merger':
|
||||
name => 'zuul-merger',
|
||||
enable => true,
|
||||
hasrestart => true,
|
||||
require => File['/etc/init.d/zuul-merger'],
|
||||
}
|
||||
|
||||
cron { 'zuul_repack':
|
||||
user => 'zuul',
|
||||
hour => '4',
|
||||
minute => '7',
|
||||
command => 'find /var/lib/zuul/git/ -maxdepth 3 -type d -name ".git" -exec git --git-dir="{}" pack-refs --all \;',
|
||||
environment => 'PATH=/usr/bin:/bin:/usr/sbin:/sbin',
|
||||
require => [User['zuul'],
|
||||
File['/var/lib/zuul/git']],
|
||||
}
|
||||
|
||||
include logrotate
|
||||
logrotate::file { 'merger.log':
|
||||
log => '/var/log/zuul/merger.log',
|
||||
options => [
|
||||
'compress',
|
||||
'missingok',
|
||||
'rotate 30',
|
||||
'daily',
|
||||
'notifempty',
|
||||
],
|
||||
require => Service['zuul-merger'],
|
||||
}
|
||||
logrotate::file { 'merger-debug.log':
|
||||
log => '/var/log/zuul/merger-debug.log',
|
||||
options => [
|
||||
'compress',
|
||||
'missingok',
|
||||
'rotate 30',
|
||||
'daily',
|
||||
'notifempty',
|
||||
],
|
||||
require => Service['zuul-merger'],
|
||||
}
|
||||
}
|
||||
@ -1,81 +0,0 @@
|
||||
# Copyright 2012-2013 Hewlett-Packard Development Company, L.P.
|
||||
# Copyright 2014 OpenStack Foundation
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
# == Class: zuul::server
|
||||
#
|
||||
class zuul::server (
|
||||
$layout_dir = '',
|
||||
) {
|
||||
service { 'zuul':
|
||||
name => 'zuul',
|
||||
enable => true,
|
||||
hasrestart => true,
|
||||
require => File['/etc/init.d/zuul'],
|
||||
}
|
||||
|
||||
exec { 'zuul-reload':
|
||||
command => '/etc/init.d/zuul reload',
|
||||
require => File['/etc/init.d/zuul'],
|
||||
refreshonly => true,
|
||||
}
|
||||
|
||||
file { '/etc/zuul/layout':
|
||||
ensure => directory,
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0755',
|
||||
recurse => true,
|
||||
purge => true,
|
||||
force => true,
|
||||
source => $layout_dir,
|
||||
require => File['/etc/zuul'],
|
||||
notify => Exec['zuul-reload'],
|
||||
}
|
||||
|
||||
include logrotate
|
||||
logrotate::file { 'zuul.log':
|
||||
log => '/var/log/zuul/zuul.log',
|
||||
options => [
|
||||
'compress',
|
||||
'missingok',
|
||||
'rotate 30',
|
||||
'daily',
|
||||
'notifempty',
|
||||
],
|
||||
require => Service['zuul'],
|
||||
}
|
||||
logrotate::file { 'zuul-debug.log':
|
||||
log => '/var/log/zuul/debug.log',
|
||||
options => [
|
||||
'compress',
|
||||
'missingok',
|
||||
'rotate 30',
|
||||
'daily',
|
||||
'notifempty',
|
||||
],
|
||||
require => Service['zuul'],
|
||||
}
|
||||
logrotate::file { 'gearman-server.log':
|
||||
log => '/var/log/zuul/gearman-server.log',
|
||||
options => [
|
||||
'compress',
|
||||
'missingok',
|
||||
'rotate 7',
|
||||
'daily',
|
||||
'notifempty',
|
||||
],
|
||||
require => Service['zuul'],
|
||||
}
|
||||
}
|
||||
@ -1,55 +0,0 @@
|
||||
[gearman]
|
||||
server=<%= gearman_server %>
|
||||
|
||||
[gearman_server]
|
||||
start=<%= internal_gearman %>
|
||||
log_config=/etc/zuul/gearman-logging.conf
|
||||
|
||||
[gerrit]
|
||||
server=<%= gerrit_server %>
|
||||
user=<%= gerrit_user %>
|
||||
sshkey=/var/lib/zuul/ssh/id_rsa
|
||||
<% if gerrit_baseurl != "" -%>
|
||||
baseurl=<%= gerrit_baseurl %>
|
||||
<% end -%>
|
||||
|
||||
[zuul]
|
||||
layout_config=/etc/zuul/layout/layout.yaml
|
||||
log_config=/etc/zuul/logging.conf
|
||||
state_dir=/var/lib/zuul
|
||||
url_pattern=<%= url_pattern %>
|
||||
status_url=<%= status_url %>
|
||||
job_name_in_report=<%= job_name_in_report %>
|
||||
|
||||
[merger]
|
||||
git_dir=/var/lib/zuul/git
|
||||
zuul_url=<%= zuul_url %>
|
||||
log_config=/etc/zuul/merger-logging.conf
|
||||
<% if git_email != "" -%>
|
||||
git_user_email=<%= git_email %>
|
||||
<% end -%>
|
||||
<% if git_name != "" -%>
|
||||
git_user_name=<%= git_name %>
|
||||
<% end -%>
|
||||
|
||||
<% if swift_authurl != "" -%>
|
||||
[swift]
|
||||
authurl=<%= swift_authurl %>
|
||||
user=<%= swift_user %>
|
||||
key=<%= swift_key %>
|
||||
tenant_name=<%= swift_tenant_name %>
|
||||
region_name=<%= swift_region_name %>
|
||||
default_container=<%= swift_default_container %>
|
||||
default_logserver_prefix=<%= swift_default_logserver_prefix %>
|
||||
<% if swift_auth_version != "" -%>
|
||||
auth_version=<%= swift_auth_version %>
|
||||
<% end -%>
|
||||
<% end -%>
|
||||
|
||||
<% if smtp_host != "" -%>
|
||||
[smtp]
|
||||
server=<%= smtp_host %>
|
||||
port=<%= smtp_port %>
|
||||
default_from=<%= smtp_default_from %>
|
||||
default_to=<%= smtp_default_to %>
|
||||
<% end -%>
|
||||
@ -1,4 +0,0 @@
|
||||
<% if scope.lookupvar("zuul::statsd_host") != "" %>
|
||||
export STATSD_HOST=<%= scope.lookupvar("zuul::statsd_host") %>
|
||||
export STATSD_PORT=8125
|
||||
<% end %>
|
||||
@ -1,47 +0,0 @@
|
||||
<VirtualHost *:80>
|
||||
ServerName <%= scope.lookupvar("::zuul::vhost_name") %>
|
||||
ServerAdmin <%= scope.lookupvar("::zuul::serveradmin") %>
|
||||
DocumentRoot /var/lib/zuul/www
|
||||
|
||||
<Directory /var/lib/zuul/www>
|
||||
Allow from all
|
||||
Satisfy Any
|
||||
</Directory>
|
||||
|
||||
ErrorLog ${APACHE_LOG_DIR}/<%= scope.lookupvar("::zuul::vhost_name") %>-error.log
|
||||
|
||||
LogLevel warn
|
||||
|
||||
CustomLog ${APACHE_LOG_DIR}/<%= scope.lookupvar("::zuul::vhost_name") %>-access.log combined
|
||||
|
||||
RewriteEngine on
|
||||
RewriteRule ^/status.json$ http://127.0.0.1:8001/status.json [P]
|
||||
|
||||
AddOutputFilterByType DEFLATE application/json
|
||||
|
||||
SetEnv GIT_PROJECT_ROOT /var/lib/zuul/git/
|
||||
SetEnv GIT_HTTP_EXPORT_ALL
|
||||
|
||||
AliasMatch ^/p/(.*/objects/[0-9a-f]{2}/[0-9a-f]{38})$ /var/lib/zuul/git/$1
|
||||
AliasMatch ^/p/(.*/objects/pack/pack-[0-9a-f]{40}.(pack|idx))$ /var/lib/zuul/git/$1
|
||||
ScriptAlias /p/ /usr/lib/git-core/git-http-backend/
|
||||
|
||||
<IfModule mod_cache.c>
|
||||
CacheDefaultExpire 5
|
||||
<IfModule mod_mem_cache.c>
|
||||
CacheEnable mem /status.json
|
||||
# 12MByte total cache size.
|
||||
MCacheSize 12288
|
||||
MCacheMaxObjectCount 10
|
||||
MCacheMinObjectSize 1
|
||||
# 8MByte max size per cache entry
|
||||
MCacheMaxObjectSize 8388608
|
||||
MCacheMaxStreamingBuffer 8388608
|
||||
</IfModule>
|
||||
<IfModule mod_cache_disk.c>
|
||||
CacheEnable disk /status.json
|
||||
CacheRoot /var/cache/apache2/mod_cache_disk
|
||||
</IfModule>
|
||||
</IfModule>
|
||||
|
||||
</VirtualHost>
|
||||
Loading…
x
Reference in New Issue
Block a user