Dzahn has submitted this change and it was merged.
Change subject: puppet-lint: fix some more indentation warnings
......................................................................
puppet-lint: fix some more indentation warnings
Change-Id: I4804e40e6646b16b442b6fac9f0df87aa3fc8cb8
---
M modules/base/manifests/expose_puppet_certs.pp
M modules/deployment/manifests/redis.pp
M modules/openstack/manifests/horizon/service.pp
M modules/phabricator/manifests/init.pp
M modules/role/manifests/analytics_cluster/database/meta.pp
M modules/role/manifests/analytics_cluster/java.pp
M modules/role/manifests/graphite/base.pp
M modules/role/manifests/graphite/production.pp
M modules/role/manifests/labs/openstack/nova.pp
M modules/varnish/manifests/common/vcl.pp
10 files changed, 38 insertions(+), 38 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/base/manifests/expose_puppet_certs.pp
b/modules/base/manifests/expose_puppet_certs.pp
index c95b7c5..f4c4e68 100644
--- a/modules/base/manifests/expose_puppet_certs.pp
+++ b/modules/base/manifests/expose_puppet_certs.pp
@@ -40,14 +40,14 @@
}
file { "${target_basedir}/ssl":
- ensure => ensure_directory($ensure),
- mode => '0555',
+ ensure => ensure_directory($ensure),
+ mode => '0555',
}
file { "${target_basedir}/ssl/cert.pem":
- ensure => $ensure,
- mode => '0444',
- source => "${ssldir}/certs/${puppet_cert_name}.pem",
+ ensure => $ensure,
+ mode => '0444',
+ source => "${ssldir}/certs/${puppet_cert_name}.pem",
}
$private_key_ensure = $ensure ? {
@@ -59,8 +59,8 @@
}
file { "${target_basedir}/ssl/server.key":
- ensure => $private_key_ensure,
- mode => '0400',
- source => "${ssldir}/private_keys/${puppet_cert_name}.pem",
+ ensure => $private_key_ensure,
+ mode => '0400',
+ source => "${ssldir}/private_keys/${puppet_cert_name}.pem",
}
}
diff --git a/modules/deployment/manifests/redis.pp
b/modules/deployment/manifests/redis.pp
index 70e8e96..3b3d4a0 100644
--- a/modules/deployment/manifests/redis.pp
+++ b/modules/deployment/manifests/redis.pp
@@ -17,8 +17,8 @@
} else {
redis::instance{ 6379:
settings => {
- daemonize => false,
- bind => '0.0.0.0',
+ daemonize => false,
+ bind => '0.0.0.0',
}
}
}
diff --git a/modules/openstack/manifests/horizon/service.pp
b/modules/openstack/manifests/horizon/service.pp
index 3e60f8d..dd8b6ca 100644
--- a/modules/openstack/manifests/horizon/service.pp
+++ b/modules/openstack/manifests/horizon/service.pp
@@ -146,14 +146,14 @@
# Install the designate dashboard
file { '/usr/share/openstack-dashboard/openstack_dashboard/local':
- ensure => 'directory',
+ ensure => 'directory',
owner => 'root',
group => 'root',
mode => '0644',
require => Package['python-designate-dashboard',
'openstack-dashboard'],
}
file { '/usr/share/openstack-dashboard/openstack_dashboard/local/enabled':
- ensure => 'directory',
+ ensure => 'directory',
owner => 'root',
group => 'root',
mode => '0644',
diff --git a/modules/phabricator/manifests/init.pp
b/modules/phabricator/manifests/init.pp
index 73a5f62..0f40d92 100644
--- a/modules/phabricator/manifests/init.pp
+++ b/modules/phabricator/manifests/init.pp
@@ -139,9 +139,9 @@
}
file { $phabdir:
- ensure => 'link',
- target => $deploy_root,
- require => Package[$deploy_target],
+ ensure => 'link',
+ target => $deploy_root,
+ require => Package[$deploy_target],
}
file { "${phabdir}/phabricator/scripts/":
diff --git a/modules/role/manifests/analytics_cluster/database/meta.pp
b/modules/role/manifests/analytics_cluster/database/meta.pp
index 342fa8b..7cb49a1 100644
--- a/modules/role/manifests/analytics_cluster/database/meta.pp
+++ b/modules/role/manifests/analytics_cluster/database/meta.pp
@@ -21,10 +21,10 @@
}
class { 'mariadb::config':
- config => $config_template,
- password => false,
- datadir => '/var/lib/mysql',
- require => Class['mariadb::packages_wmf'],
+ config => $config_template,
+ password => false,
+ datadir => '/var/lib/mysql',
+ require => Class['mariadb::packages_wmf'],
}
file { '/etc/init.d/mysql':
diff --git a/modules/role/manifests/analytics_cluster/java.pp
b/modules/role/manifests/analytics_cluster/java.pp
index b47a286..930375f 100644
--- a/modules/role/manifests/analytics_cluster/java.pp
+++ b/modules/role/manifests/analytics_cluster/java.pp
@@ -14,7 +14,7 @@
# Make sure file.encoding is UTF-8 for all java processes.
# This should help avoid bugs like T128295.
file_line { 'java_tool_options_file_encoding_utf_8':
- line => 'JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8"',
- path => '/etc/environment',
+ line => 'JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8"',
+ path => '/etc/environment',
}
}
diff --git a/modules/role/manifests/graphite/base.pp
b/modules/role/manifests/graphite/base.pp
index 7bfed76..e8651d4 100644
--- a/modules/role/manifests/graphite/base.pp
+++ b/modules/role/manifests/graphite/base.pp
@@ -227,14 +227,14 @@
}
ferm::service { 'carbon_c_relay-frontend_relay_udp':
- proto => 'udp',
- port => '2003',
+ proto => 'udp',
+ port => '2003',
srange => '$INTERNAL',
}
ferm::service { 'carbon_c_relay-frontend_relay_tcp':
- proto => 'tcp',
- port => '2003',
+ proto => 'tcp',
+ port => '2003',
srange => '$INTERNAL',
}
@@ -244,8 +244,8 @@
}
ferm::service { 'carbon_pickled':
- proto => 'tcp',
- port => '2004',
+ proto => 'tcp',
+ port => '2004',
srange => '$INTERNAL',
}
}
diff --git a/modules/role/manifests/graphite/production.pp
b/modules/role/manifests/graphite/production.pp
index 1a6cdc9..d9615dd 100644
--- a/modules/role/manifests/graphite/production.pp
+++ b/modules/role/manifests/graphite/production.pp
@@ -17,15 +17,15 @@
}
ferm::service { 'carbon_c_relay-local_relay_udp':
- proto => 'udp',
- port => '1903',
- srange => '@resolve((graphite1001.eqiad.wmnet
graphite2001.codfw.wmnet))',
+ proto => 'udp',
+ port => '1903',
+ srange => '@resolve((graphite1001.eqiad.wmnet
graphite2001.codfw.wmnet))',
}
ferm::service { 'carbon_c_relay-local_relay_tcp':
- proto => 'tcp',
- port => '1903',
- srange => '@resolve((graphite1001.eqiad.wmnet
graphite2001.codfw.wmnet))',
+ proto => 'tcp',
+ port => '1903',
+ srange => '@resolve((graphite1001.eqiad.wmnet
graphite2001.codfw.wmnet))',
}
}
diff --git a/modules/role/manifests/labs/openstack/nova.pp
b/modules/role/manifests/labs/openstack/nova.pp
index c57d2ec..acc50d3 100644
--- a/modules/role/manifests/labs/openstack/nova.pp
+++ b/modules/role/manifests/labs/openstack/nova.pp
@@ -142,7 +142,7 @@
}
class { '::openstack::envscripts':
- novaconfig => $novaconfig,
+ novaconfig => $novaconfig,
designateconfig => $designateconfig
}
diff --git a/modules/varnish/manifests/common/vcl.pp
b/modules/varnish/manifests/common/vcl.pp
index 1c6828d..c4620b6 100644
--- a/modules/varnish/manifests/common/vcl.pp
+++ b/modules/varnish/manifests/common/vcl.pp
@@ -16,10 +16,10 @@
}
file { '/etc/varnish/errorpage.html':
- owner => 'root',
- group => 'root',
- mode => '0444',
- source => 'puppet:///files/varnish/errorpage.html',
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ source => 'puppet:///files/varnish/errorpage.html',
}
# VCL unit tests
--
To view, visit https://gerrit.wikimedia.org/r/278023
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4804e40e6646b16b442b6fac9f0df87aa3fc8cb8
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Ema <[email protected]>
Gerrit-Reviewer: Gehel <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
