Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/198854
Change subject: puppet-lint: fix all 2sp_soft_tabs errors
......................................................................
puppet-lint: fix all 2sp_soft_tabs errors
These are the (only) errors that keep us from re-enabling 2sp_soft_tabs lint
check.
This should make jenkins like Ifc2dc02bdd02aff0055bb9 again.
Change-Id: I9c5d93fd6b5f22f6b17d3f45c1019adaa71e7975
---
M manifests/role/cache.pp
M manifests/role/nova.pp
M manifests/role/phabricator.pp
M manifests/role/statistics.pp
M manifests/site.pp
M modules/cxserver/manifests/init.pp
M modules/dataset/manifests/html.pp
7 files changed, 16 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/54/198854/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 5005633..52a7040 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -196,8 +196,8 @@
},
'parsoid' => {
'eqiad' => [
- 'cp1045.eqiad.wmnet',
- 'cp1058.eqiad.wmnet',
+ 'cp1045.eqiad.wmnet',
+ 'cp1058.eqiad.wmnet',
],
'esams' => [],
'ulsfo' => []
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index 8644904..a882d33 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -208,8 +208,8 @@
port => '443',
}
- # allow ssh from deployment hosts
- ferm::rule { 'deployment-ssh':
+ # allow ssh from deployment hosts
+ ferm::rule { 'deployment-ssh':
ensure => present,
rule => 'proto tcp dport ssh saddr $DEPLOYMENT_HOSTS ACCEPT;',
}
diff --git a/manifests/role/phabricator.pp b/manifests/role/phabricator.pp
index 84ebe3a..8fdd560 100644
--- a/manifests/role/phabricator.pp
+++ b/manifests/role/phabricator.pp
@@ -43,7 +43,7 @@
sprint_tag => 'release/2015-02-18',
security_tag => 'release/2015-01-13/1',
libraries => ['/srv/phab/libext/Sprint/src',
- '/srv/phab/libext/security/src'],
+ '/srv/phab/libext/security/src'],
extension_tag => 'HEAD',
extensions => [ 'MediaWikiUserpageCustomField.php',
'LDAPUserpageCustomField.php'],
diff --git a/manifests/role/statistics.pp b/manifests/role/statistics.pp
index 6d67ca0..a56b08b 100644
--- a/manifests/role/statistics.pp
+++ b/manifests/role/statistics.pp
@@ -46,7 +46,7 @@
# geowiki: bringing data from production slave db to research db
include geowiki::job::data
- # geowiki: generate limn files from research db and push them
+ # geowiki: generate limn files from research db and push them
include geowiki::job::limn
# geowiki: monitors the geowiki files of http://gp.wmflabs.org/
include geowiki::job::monitoring
diff --git a/manifests/site.pp b/manifests/site.pp
index cf0c29b..28a1615 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1810,7 +1810,7 @@
'/dev/sda', '/dev/sdb', '/dev/sdc', '/dev/sdd',
'/dev/sde', '/dev/sdf', '/dev/sdg', '/dev/sdh',
'/dev/sdi', '/dev/sdj', '/dev/sdk', '/dev/sdl'
- ]
+ ]
role swift::eqiad_prod::storage
@@ -1828,7 +1828,7 @@
'/dev/sdm', '/dev/sdn', '/dev/sdc', '/dev/sdd',
'/dev/sde', '/dev/sdf', '/dev/sdg', '/dev/sdh',
'/dev/sdi', '/dev/sdj', '/dev/sdk', '/dev/sdl'
- ]
+ ]
role swift::eqiad_prod::storage
diff --git a/modules/cxserver/manifests/init.pp
b/modules/cxserver/manifests/init.pp
index 9ace4c1..c6f1d79 100644
--- a/modules/cxserver/manifests/init.pp
+++ b/modules/cxserver/manifests/init.pp
@@ -46,9 +46,7 @@
require_package('nodejs')
$ordered_registry = ordered_json($registry)
- package { [
- 'cxserver/deploy',
- ]:
+ package { [ 'cxserver/deploy', ]:
ensure => present,
provider => 'trebuchet',
}
diff --git a/modules/dataset/manifests/html.pp
b/modules/dataset/manifests/html.pp
index 7a65266..16aaa3f 100644
--- a/modules/dataset/manifests/html.pp
+++ b/modules/dataset/manifests/html.pp
@@ -30,13 +30,13 @@
}
if ($poty) {
file { "${dataset::dirs::otherdir}/poty/index.html":
- ensure => 'present',
- path => "${dataset::dirs::otherdir}/poty/index.html",
- mode => '0644',
- owner => 'root',
- group => 'root',
- source => 'puppet:///modules/dataset/html/poty_index.html',
- }
+ ensure => 'present',
+ path => "${dataset::dirs::otherdir}/poty/index.html",
+ mode => '0644',
+ owner => 'root',
+ group => 'root',
+ source => 'puppet:///modules/dataset/html/poty_index.html',
+ }
}
if ($archive) {
file { "${dataset::dirs::publicdir}/archive/index.html":
--
To view, visit https://gerrit.wikimedia.org/r/198854
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9c5d93fd6b5f22f6b17d3f45c1019adaa71e7975
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
