[MediaWiki-commits] [Gerrit] zuul: pass puppet-lint (whitespaces) - change (operations/puppet)
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 =
[MediaWiki-commits] [Gerrit] zuul: pass puppet-lint (whitespaces) - change (operations/puppet)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/61244
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(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/44/61244/1
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
