KartikMistry has uploaded a new change for review. https://gerrit.wikimedia.org/r/181404
Change subject: Fixed spacing and alignment ...................................................................... Fixed spacing and alignment This fixes lint 'two-space soft tabs not used'. Change-Id: I78aae2a826ba663711964faaea9040247cd0022e --- M modules/bacula/manifests/client/job.pp M modules/diamond/manifests/init.pp M modules/install-server/manifests/dhcp-server.pp M modules/labs_lvm/manifests/volume.pp M modules/postgresql/manifests/user.pp M modules/puppet_compiler/manifests/packages.pp 6 files changed, 37 insertions(+), 35 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/04/181404/1 diff --git a/modules/bacula/manifests/client/job.pp b/modules/bacula/manifests/client/job.pp index 698ad35..4663249 100644 --- a/modules/bacula/manifests/client/job.pp +++ b/modules/bacula/manifests/client/job.pp @@ -25,9 +25,9 @@ # } # define bacula::client::job( - $fileset, - $jobdefaults, - $extras=undef) { + $fileset, + $jobdefaults, + $extras=undef) { $director = $::bacula::client::director diff --git a/modules/diamond/manifests/init.pp b/modules/diamond/manifests/init.pp index 3926fcd..42e43c0 100644 --- a/modules/diamond/manifests/init.pp +++ b/modules/diamond/manifests/init.pp @@ -58,8 +58,9 @@ $path_prefix = 'servers', $keep_logs_for = '5', $service = running, - $settings = { host => 'localhost', - port => '8125', + $settings = { + host => 'localhost', + port => '8125', }, ) { if os_version('debian >= jessie || ubuntu >= precise') { diff --git a/modules/install-server/manifests/dhcp-server.pp b/modules/install-server/manifests/dhcp-server.pp index b1fbac8..64daaa6 100644 --- a/modules/install-server/manifests/dhcp-server.pp +++ b/modules/install-server/manifests/dhcp-server.pp @@ -38,9 +38,10 @@ service { $service_name: ensure => running, - require => [ Package[$package_name], - File[$confdir] - ], + require => [ + Package[$package_name], + File[$confdir] + ], subscribe => File[$confdir], } } diff --git a/modules/labs_lvm/manifests/volume.pp b/modules/labs_lvm/manifests/volume.pp index 7b4cc4a..89d0a0a 100644 --- a/modules/labs_lvm/manifests/volume.pp +++ b/modules/labs_lvm/manifests/volume.pp @@ -42,9 +42,9 @@ unless => "/bin/mountpoint -q '$mountat'", logoutput => 'on_failure', require => [ - File['/usr/local/sbin/make-instance-vol'], - Exec['create-volume-group'] - ], + File['/usr/local/sbin/make-instance-vol'], + Exec['create-volume-group'] + ], command => "/usr/local/sbin/make-instance-vol '$volname' '$size' '$fstype' $mkfs_opt", } @@ -62,9 +62,9 @@ options => $options, fstype => $fstype, require => [ - Exec["create-vd-$volname"], - File[$mountat], - ], + Exec["create-vd-$volname"], + File[$mountat], + ], } labs_lvm::extend { $mountat: diff --git a/modules/postgresql/manifests/user.pp b/modules/postgresql/manifests/user.pp index 59dd3f6..c48f89f 100644 --- a/modules/postgresql/manifests/user.pp +++ b/modules/postgresql/manifests/user.pp @@ -25,16 +25,16 @@ # Based upon https://github.com/uggedal/puppet-module-postgresql # define postgresql::user( - $user, - $password, - $database = 'template1', - $type = 'host', - $method = 'md5', - $cidr = '127.0.0.1/32', - $pgversion = '9.1', - $attrs = '', - $ensure = 'present' - ) { + $user, + $password, + $database = 'template1', + $type = 'host', + $method = 'md5', + $cidr = '127.0.0.1/32', + $pgversion = '9.1', + $attrs = '', + $ensure = 'present' + ) { # Check if our user exists and store it $userexists = "/usr/bin/psql --tuples-only -c \'SELECT rolname FROM pg_catalog.pg_roles;\' | /bin/grep \'^ ${user}\'" diff --git a/modules/puppet_compiler/manifests/packages.pp b/modules/puppet_compiler/manifests/packages.pp index 09344dd..56a6088 100644 --- a/modules/puppet_compiler/manifests/packages.pp +++ b/modules/puppet_compiler/manifests/packages.pp @@ -1,16 +1,16 @@ class puppet_compiler::packages($ensure = $puppet_compiler::ensure) { include stdlib $list = [ - 'curl', - 'python-dev', - 'rubygems', - 'ruby-bundler', - 'ruby1.8-dev', - 'mysql-server', - 'mysql-client', - 'ruby-mysql', - 'ruby-bcrypt', - 'nginx' - ] + 'curl', + 'python-dev', + 'rubygems', + 'ruby-bundler', + 'ruby1.8-dev', + 'mysql-server', + 'mysql-client', + 'ruby-mysql', + 'ruby-bcrypt', + 'nginx' + ] ensure_packages([$list]) } -- To view, visit https://gerrit.wikimedia.org/r/181404 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I78aae2a826ba663711964faaea9040247cd0022e Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: KartikMistry <kartik.mis...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits