Dzahn has submitted this change and it was merged.
Change subject: zuul: pass puppet-lint (whitespaces)
......................................................................
zuul: pass puppet-lint (whitespaces)
Convert the Zuul manifest to use spaces instead of tabs. Also fix up
arrows alignements.
No functionals changes.
Change-Id: I71f105800ccb944e440e3da45daef18608df9788
---
M modules/zuul/manifests/init.pp
1 file changed, 110 insertions(+), 110 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/zuul/manifests/init.pp b/modules/zuul/manifests/init.pp
index c2bad0c..de4cf54 100644
--- a/modules/zuul/manifests/init.pp
+++ b/modules/zuul/manifests/init.pp
@@ -23,132 +23,132 @@
$push_change_refs,
) {
- # Dependencies as mentionned in zuul:tools/pip-requires
- $packages = [
- 'python-yaml',
- 'python-webob',
- 'python-daemon',
- 'python-lockfile',
- 'python-paramiko',
- 'python-jenkins',
- 'python-paste',
+ # Dependencies as mentionned in zuul:tools/pip-requires
+ $packages = [
+ 'python-yaml',
+ 'python-webob',
+ 'python-daemon',
+ 'python-lockfile',
+ 'python-paramiko',
+ 'python-jenkins',
+ 'python-paste',
- # GitPython at least 0.3.2RC1 which is neither in Lucid
nor in Precise
- # We had to backport it and its dependencies from
Quantal:
- 'python-git',
- 'python-gitdb',
- 'python-async',
- 'python-smmap',
+ # GitPython at least 0.3.2RC1 which is neither in Lucid nor in Precise
+ # We had to backport it and its dependencies from Quantal:
+ 'python-git',
+ 'python-gitdb',
+ 'python-async',
+ 'python-smmap',
- 'python-extras', # backported in Precise (bug 47122)
- 'python-statsd',
+ 'python-extras', # backported in Precise (bug 47122)
+ 'python-statsd',
- 'python-setuptools',
- ]
+ 'python-setuptools',
+ ]
- package { $packages:
- ensure => present,
- }
+ package { $packages:
+ ensure => present,
+ }
- # We have packaged the python voluptuous module under
- # operations/debs/python-voluptuous. Zuul does not work
- # AT ALL with version 0.7 so make sure we have 0.6.x
- package { 'python-voluptuous':
- ensure => '0.6.1-1~wmf1',
- }
+ # We have packaged the python voluptuous module under
+ # operations/debs/python-voluptuous. Zuul does not work
+ # AT ALL with version 0.7 so make sure we have 0.6.x
+ package { 'python-voluptuous':
+ ensure => '0.6.1-1~wmf1',
+ }
- # Used to be in /var/lib/git/zuul but /var/lib/git can be used
- # to replicate git bare repositories.
- $zuul_source_dir = '/usr/local/src/zuul'
+ # Used to be in /var/lib/git/zuul but /var/lib/git can be used
+ # to replicate git bare repositories.
+ $zuul_source_dir = '/usr/local/src/zuul'
- git::clone { 'integration/zuul':
- ensure => present,
- directory => $zuul_source_dir,
- origin => $git_source_repo,
- branch => $git_branch,
- }
+ git::clone { 'integration/zuul':
+ ensure => present,
+ directory => $zuul_source_dir,
+ origin => $git_source_repo,
+ branch => $git_branch,
+ }
- # We do not ship `statsd` python module so ignore it
- # it is gracefully ignored by Zuul.
- exec { 'remove_statsd_dependency':
- command => '/bin/sed -i "s/^statsd/#statsd/"
tools/pip-requires',
- cwd => $zuul_source_dir,
- refreshonly => true,
- subscribe => Git::Clone['integration/zuul'],
- }
+ # We do not ship `statsd` python module so ignore it
+ # it is gracefully ignored by Zuul.
+ exec { 'remove_statsd_dependency':
+ command => '/bin/sed -i "s/^statsd/#statsd/" tools/pip-requires',
+ cwd => $zuul_source_dir,
+ refreshonly => true,
+ subscribe => Git::Clone['integration/zuul'],
+ }
- exec { 'install_zuul':
- # Make sure to install without downloading from pypi
- command => 'python setup.py easy_install --allow-hosts=None .',
- cwd => $zuul_source_dir,
- path => '/bin:/usr/bin',
- refreshonly => true,
- subscribe => Git::Clone['integration/zuul'],
- require => [
- Exec['remove_statsd_dependency'],
- Package['python-setuptools'],
- ],
- }
+ exec { 'install_zuul':
+ # Make sure to install without downloading from pypi
+ command => 'python setup.py easy_install --allow-hosts=None .',
+ cwd => $zuul_source_dir,
+ path => '/bin:/usr/bin',
+ refreshonly => true,
+ subscribe => Git::Clone['integration/zuul'],
+ require => [
+ Exec['remove_statsd_dependency'],
+ Package['python-setuptools'],
+ ],
+ }
- file { '/etc/zuul':
- ensure => directory,
- }
+ 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 => 'jenkins',
- mode => '0400',
- content => template('zuul/zuul.conf.erb'),
- require => [
- File['/etc/zuul'],
- Package['jenkins'],
- ],
- }
+ # 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 => 'jenkins',
+ mode => '0400',
+ content => template('zuul/zuul.conf.erb'),
+ require => [
+ File['/etc/zuul'],
+ Package['jenkins'],
+ ],
+ }
- file { '/var/log/zuul':
- ensure => directory,
- owner => 'jenkins',
- require => Package['jenkins'],
- }
+ file { '/var/log/zuul':
+ ensure => directory,
+ owner => 'jenkins',
+ require => Package['jenkins'],
+ }
- file { '/var/run/zuul':
- ensure => directory,
- owner => 'jenkins',
- require => Package['jenkins'],
- }
+ file { '/var/run/zuul':
+ ensure => directory,
+ owner => 'jenkins',
+ require => Package['jenkins'],
+ }
- file { '/var/lib/zuul':
- ensure => directory,
- owner => 'jenkins',
- require => Package['jenkins'],
- }
+ file { '/var/lib/zuul':
+ ensure => directory,
+ owner => 'jenkins',
+ require => Package['jenkins'],
+ }
- file { $git_dir:
- ensure => directory,
- owner => 'jenkins',
- require => Package['jenkins'],
- }
+ file { $git_dir:
+ ensure => directory,
+ owner => 'jenkins',
+ require => Package['jenkins'],
+ }
- file { '/etc/init.d/zuul/':
- ensure => present,
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///modules/zuul/zuul.init',
- }
+ file { '/etc/init.d/zuul/':
+ ensure => present,
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ source => 'puppet:///modules/zuul/zuul.init',
+ }
- exec { 'zuul-reload':
- command => '/etc/init.d/zuul reload',
- require => File['/etc/init.d/zuul'],
- refreshonly => true,
- }
+ exec { 'zuul-reload':
+ command => '/etc/init.d/zuul reload',
+ require => File['/etc/init.d/zuul'],
+ refreshonly => true,
+ }
- service { 'zuul':
- name => 'zuul',
- enable => true,
- hasrestart => true,
- require => File['/etc/init.d/zuul'],
- }
+ service { 'zuul':
+ name => 'zuul',
+ enable => true,
+ hasrestart => true,
+ require => File['/etc/init.d/zuul'],
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/61244
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I71f105800ccb944e440e3da45daef18608df9788
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
