opendev/puppet-zuul
Code Issues Proposed changes

Revert "Disable arrow alignment puppet lint check"

Browse Source 
This reverts commit a2742ec163df030ba7ea1d2d16dde99f9a28b261.

Change-Id: Icb7a47e68d0a22f7cdc3d88b7962c713489757e2
This commit is contained in:
James E. Blair 2015-03-16 11:38:15 -07:00
parent a2742ec163
commit bbc5d6f9de
3 changed files with 114 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Rakefile
View File

@ -6,4 +6,3 @@ PuppetLint.configuration.send('disable_80chars')
PuppetLint.configuration.send('disable_autoloader_layout') PuppetLint.configuration.send('disable_autoloader_layout')
PuppetLint.configuration.send('disable_class_inherits_from_params_class') PuppetLint.configuration.send('disable_class_inherits_from_params_class')
PuppetLint.configuration.send('disable_class_parameter_defaults') PuppetLint.configuration.send('disable_class_parameter_defaults')
PuppetLint.configuration.send('disable_arrow_alignment')

196
manifests/init.pp
View File

@ -66,9 +66,9 @@ class zuul (
} }
package { 'yappi': package { 'yappi':
ensure => present, ensure => present,
provider => pip, provider => pip,
require => Class['pip'], require => Class['pip'],
} }
# needed by python-keystoneclient, has system bindings # needed by python-keystoneclient, has system bindings
@ -89,7 +89,7 @@ class zuul (
if ! defined(Package['python-paramiko']) { if ! defined(Package['python-paramiko']) {
package { 'python-paramiko': package { 'python-paramiko':
ensure => present, ensure => present,
} }
} }
@ -106,12 +106,12 @@ class zuul (
} }
user { 'zuul': user { 'zuul':
ensure => present, ensure => present,
home => '/home/zuul', home => '/home/zuul',
shell => '/bin/bash', shell => '/bin/bash',
gid => 'zuul', gid => 'zuul',
managehome => true, managehome => true,
require => Group['zuul'], require => Group['zuul'],
} }
group { 'zuul': group { 'zuul':
@ -119,18 +119,18 @@ class zuul (
} }
vcsrepo { '/opt/zuul': vcsrepo { '/opt/zuul':
ensure => latest, ensure => latest,
provider => git, provider => git,
revision => $revision, revision => $revision,
source => $git_source_repo, source => $git_source_repo,
} }
exec { 'install_zuul' : exec { 'install_zuul' :
command => 'pip install -U /opt/zuul', command => 'pip install -U /opt/zuul',
path => '/usr/local/bin:/usr/bin:/bin/', path => '/usr/local/bin:/usr/bin:/bin/',
refreshonly => true, refreshonly => true,
subscribe => Vcsrepo['/opt/zuul'], subscribe => Vcsrepo['/opt/zuul'],
require => [ require => [
Class['pip'], Class['pip'],
Package['gcc'], Package['gcc'],
Package['python-daemon'], Package['python-daemon'],
@ -151,9 +151,9 @@ class zuul (
# TODO: We should put in notify either Service['zuul'] or Exec['zuul-reload'] # TODO: We should put in notify either Service['zuul'] or Exec['zuul-reload']
# at some point, but that still has some problems. # at some point, but that still has some problems.
file { '/etc/zuul/zuul.conf': file { '/etc/zuul/zuul.conf':
ensure => present, ensure => present,
owner => 'zuul', owner => 'zuul',
mode => '0400', mode => '0400',
content => template('zuul/zuul.conf.erb'), content => template('zuul/zuul.conf.erb'),
require => [ require => [
File['/etc/zuul'], File['/etc/zuul'],
@ -162,61 +162,61 @@ class zuul (
} }
file { '/etc/default/zuul': file { '/etc/default/zuul':
ensure => present, ensure => present,
mode => '0444', mode => '0444',
content => template('zuul/zuul.default.erb'), content => template('zuul/zuul.default.erb'),
} }
file { '/var/log/zuul': file { '/var/log/zuul':
ensure => directory, ensure => directory,
owner => 'zuul', owner => 'zuul',
require => User['zuul'], require => User['zuul'],
} }
file { '/var/run/zuul': file { '/var/run/zuul':
ensure => directory, ensure => directory,
owner => 'zuul', owner => 'zuul',
group => 'zuul', group => 'zuul',
require => User['zuul'], require => User['zuul'],
} }
file { '/var/run/zuul-merger': file { '/var/run/zuul-merger':
ensure => directory, ensure => directory,
owner => 'zuul', owner => 'zuul',
group => 'zuul', group => 'zuul',
require => User['zuul'], require => User['zuul'],
} }
file { '/var/lib/zuul': file { '/var/lib/zuul':
ensure => directory, ensure => directory,
owner => 'zuul', owner => 'zuul',
group => 'zuul', group => 'zuul',
} }
file { '/var/lib/zuul/git': file { '/var/lib/zuul/git':
ensure => directory, ensure => directory,
owner => 'zuul', owner => 'zuul',
require => File['/var/lib/zuul'], require => File['/var/lib/zuul'],
} }
file { '/var/lib/zuul/ssh': file { '/var/lib/zuul/ssh':
ensure => directory, ensure => directory,
owner => 'zuul', owner => 'zuul',
group => 'zuul', group => 'zuul',
mode => '0500', mode => '0500',
require => File['/var/lib/zuul'], require => File['/var/lib/zuul'],
} }
file { '/var/lib/zuul/ssh/id_rsa': file { '/var/lib/zuul/ssh/id_rsa':
owner => 'zuul', owner => 'zuul',
group => 'zuul', group => 'zuul',
mode => '0400', mode => '0400',
require => File['/var/lib/zuul/ssh'], require => File['/var/lib/zuul/ssh'],
content => $zuul_ssh_private_key, content => $zuul_ssh_private_key,
} }
file { '/var/lib/zuul/www': file { '/var/lib/zuul/www':
ensure => directory, ensure => directory,
require => File['/var/lib/zuul'], require => File['/var/lib/zuul'],
} }
@ -225,101 +225,101 @@ class zuul (
} }
file { '/var/lib/zuul/www/jquery.min.js': file { '/var/lib/zuul/www/jquery.min.js':
ensure => link, ensure => link,
target => '/usr/share/javascript/jquery/jquery.min.js', target => '/usr/share/javascript/jquery/jquery.min.js',
require => [File['/var/lib/zuul/www'], require => [File['/var/lib/zuul/www'],
Package['libjs-jquery']], Package['libjs-jquery']],
} }
vcsrepo { '/opt/twitter-bootstrap': vcsrepo { '/opt/twitter-bootstrap':
ensure => latest, ensure => latest,
provider => git, provider => git,
revision => 'v3.1.1', revision => 'v3.1.1',
source => 'https://github.com/twbs/bootstrap.git', source => 'https://github.com/twbs/bootstrap.git',
} }
file { '/var/lib/zuul/www/bootstrap': file { '/var/lib/zuul/www/bootstrap':
ensure => link, ensure => link,
target => '/opt/twitter-bootstrap/dist', target => '/opt/twitter-bootstrap/dist',
require => [File['/var/lib/zuul/www'], require => [File['/var/lib/zuul/www'],
Package['libjs-jquery'], Package['libjs-jquery'],
Vcsrepo['/opt/twitter-bootstrap']], Vcsrepo['/opt/twitter-bootstrap']],
} }
vcsrepo { '/opt/jquery-visibility': vcsrepo { '/opt/jquery-visibility':
ensure => latest, ensure => latest,
provider => git, provider => git,
revision => 'master', revision => 'master',
source => 'https://github.com/mathiasbynens/jquery-visibility.git', source => 'https://github.com/mathiasbynens/jquery-visibility.git',
} }
exec { 'install-jquery-visibility': exec { 'install-jquery-visibility':
command => 'yui-compressor -o /var/lib/zuul/www/jquery-visibility.min.js /opt/jquery-visibility/jquery-visibility.js', command => 'yui-compressor -o /var/lib/zuul/www/jquery-visibility.min.js /opt/jquery-visibility/jquery-visibility.js',
path => 'bin:/usr/bin', path => 'bin:/usr/bin',
refreshonly => true, refreshonly => true,
subscribe => Vcsrepo['/opt/jquery-visibility'], subscribe => Vcsrepo['/opt/jquery-visibility'],
require => [File['/var/lib/zuul/www'], require => [File['/var/lib/zuul/www'],
Package['yui-compressor'], Package['yui-compressor'],
Vcsrepo['/opt/jquery-visibility']], Vcsrepo['/opt/jquery-visibility']],
} }
vcsrepo { '/opt/graphitejs': vcsrepo { '/opt/graphitejs':
ensure => latest, ensure => latest,
provider => git, provider => git,
revision => 'master', revision => 'master',
source => 'https://github.com/prestontimmons/graphitejs.git', source => 'https://github.com/prestontimmons/graphitejs.git',
} }
file { '/var/lib/zuul/www/jquery.graphite.js': file { '/var/lib/zuul/www/jquery.graphite.js':
ensure => link, ensure => link,
target => '/opt/graphitejs/jquery.graphite.js', target => '/opt/graphitejs/jquery.graphite.js',
require => [File['/var/lib/zuul/www'], require => [File['/var/lib/zuul/www'],
Vcsrepo['/opt/graphitejs']], Vcsrepo['/opt/graphitejs']],
} }
file { '/var/lib/zuul/www/index.html': file { '/var/lib/zuul/www/index.html':
ensure => link, ensure => link,
target => '/opt/zuul/etc/status/public_html/index.html', target => '/opt/zuul/etc/status/public_html/index.html',
require => File['/var/lib/zuul/www'], require => File['/var/lib/zuul/www'],
} }
file { '/var/lib/zuul/www/styles': file { '/var/lib/zuul/www/styles':
ensure => link, ensure => link,
target => '/opt/zuul/etc/status/public_html/styles', target => '/opt/zuul/etc/status/public_html/styles',
require => File['/var/lib/zuul/www'], require => File['/var/lib/zuul/www'],
} }
file { '/var/lib/zuul/www/zuul.app.js': file { '/var/lib/zuul/www/zuul.app.js':
ensure => link, ensure => link,
target => '/opt/zuul/etc/status/public_html/zuul.app.js', target => '/opt/zuul/etc/status/public_html/zuul.app.js',
require => File['/var/lib/zuul/www'], require => File['/var/lib/zuul/www'],
} }
file { '/var/lib/zuul/www/jquery.zuul.js': file { '/var/lib/zuul/www/jquery.zuul.js':
ensure => link, ensure => link,
target => '/opt/zuul/etc/status/public_html/jquery.zuul.js', target => '/opt/zuul/etc/status/public_html/jquery.zuul.js',
require => File['/var/lib/zuul/www'], require => File['/var/lib/zuul/www'],
} }
file { '/var/lib/zuul/www/images': file { '/var/lib/zuul/www/images':
ensure => link, ensure => link,
target => '/opt/zuul/etc/status/public_html/images', target => '/opt/zuul/etc/status/public_html/images',
require => File['/var/lib/zuul/www'], require => File['/var/lib/zuul/www'],
} }
file { '/etc/init.d/zuul': file { '/etc/init.d/zuul':
ensure => present, ensure => present,
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0555', mode => '0555',
source => 'puppet:///modules/zuul/zuul.init', source => 'puppet:///modules/zuul/zuul.init',
} }
file { '/etc/init.d/zuul-merger': file { '/etc/init.d/zuul-merger':
ensure => present, ensure => present,
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0555', mode => '0555',
source => 'puppet:///modules/zuul/zuul-merger.init', source => 'puppet:///modules/zuul/zuul-merger.init',
} }
@ -329,53 +329,53 @@ class zuul (
$ssl = true $ssl = true
file { '/etc/ssl/certs': file { '/etc/ssl/certs':
ensure => directory, ensure => directory,
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0755', mode => '0755',
} }
file { '/etc/ssl/private': file { '/etc/ssl/private':
ensure => directory, ensure => directory,
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0700', mode => '0700',
} }
file { "/etc/ssl/certs/${vhost_name}.pem": file { "/etc/ssl/certs/${vhost_name}.pem":
ensure => present, ensure => present,
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0644', mode => '0644',
content => $proxy_ssl_cert_file_contents, content => $proxy_ssl_cert_file_contents,
require => File['/etc/ssl/certs'], require => File['/etc/ssl/certs'],
before => Apache::Vhost[$vhost_name], before => Apache::Vhost[$vhost_name],
} }
file { "/etc/ssl/private/${vhost_name}.key": file { "/etc/ssl/private/${vhost_name}.key":
ensure => present, ensure => present,
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0600', mode => '0600',
content => $proxy_ssl_key_file_contents, content => $proxy_ssl_key_file_contents,
require => File['/etc/ssl/private'], require => File['/etc/ssl/private'],
before => Apache::Vhost[$vhost_name], before => Apache::Vhost[$vhost_name],
} }
if $proxy_ssl_chain_file_contents != '' { if $proxy_ssl_chain_file_contents != '' {
file { "/etc/ssl/certs/${vhost_name}_intermediate.pem": file { "/etc/ssl/certs/${vhost_name}_intermediate.pem":
ensure => present, ensure => present,
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0644', mode => '0644',
content => $proxy_ssl_cert_file_contents, content => $proxy_ssl_cert_file_contents,
require => File['/etc/ssl/certs'], require => File['/etc/ssl/certs'],
before => Apache::Vhost[$vhost_name], before => Apache::Vhost[$vhost_name],
} }
} }
} }
apache::vhost { $vhost_name: apache::vhost { $vhost_name:
port => 443, # Is required despite not being used. port => 443, # Is required despite not being used.
docroot => 'MEANINGLESS ARGUMENT', docroot => 'MEANINGLESS ARGUMENT',
priority => '50', priority => '50',
ssl => $ssl, ssl => $ssl,
template => 'zuul/zuul.vhost.erb', template => 'zuul/zuul.vhost.erb',
vhost_name => $vhost_name, vhost_name => $vhost_name,
} }
if ! defined(A2mod['rewrite']) { if ! defined(A2mod['rewrite']) {

32
manifests/server.pp
View File

@ -19,34 +19,34 @@ class zuul::server (
$layout_dir = '', $layout_dir = '',
) { ) {
service { 'zuul': service { 'zuul':
name => 'zuul', name => 'zuul',
enable => true, enable => true,
hasrestart => true, hasrestart => true,
require => File['/etc/init.d/zuul'], require => File['/etc/init.d/zuul'],
} }
exec { 'zuul-reload': exec { 'zuul-reload':
command => '/etc/init.d/zuul reload', command => '/etc/init.d/zuul reload',
require => File['/etc/init.d/zuul'], require => File['/etc/init.d/zuul'],
refreshonly => true, refreshonly => true,
} }
file { '/etc/zuul/layout': file { '/etc/zuul/layout':
ensure => directory, ensure => directory,
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0755', mode => '0755',
recurse => true, recurse => true,
purge => true, purge => true,
force => true, force => true,
source => $layout_dir, source => $layout_dir,
require => File['/etc/zuul'], require => File['/etc/zuul'],
notify => Exec['zuul-reload'], notify => Exec['zuul-reload'],
} }
include logrotate include logrotate
logrotate::file { 'zuul.log': logrotate::file { 'zuul.log':
log => '/var/log/zuul/zuul.log', log => '/var/log/zuul/zuul.log',
options => [ options => [
'compress', 'compress',
'missingok', 'missingok',
@ -57,7 +57,7 @@ class zuul::server (
require => Service['zuul'], require => Service['zuul'],
} }
logrotate::file { 'zuul-debug.log': logrotate::file { 'zuul-debug.log':
log => '/var/log/zuul/debug.log', log => '/var/log/zuul/debug.log',
options => [ options => [
'compress', 'compress',
'missingok', 'missingok',
@ -68,7 +68,7 @@ class zuul::server (
require => Service['zuul'], require => Service['zuul'],
} }
logrotate::file { 'gearman-server.log': logrotate::file { 'gearman-server.log':
log => '/var/log/zuul/gearman-server.log', log => '/var/log/zuul/gearman-server.log',
options => [ options => [
'compress', 'compress',
'missingok', 'missingok',