Andrew Bogott has submitted this change and it was merged.
Change subject: puppet_compiler: resource attributes quoting and minor lints
......................................................................
puppet_compiler: resource attributes quoting and minor lints
bug: T91908
Change-Id: I25f6e1b36c7f0870d3ade3356792d22553d3521a
---
M modules/puppet_compiler/manifests/bundle.pp
M modules/puppet_compiler/manifests/differ.pp
M modules/puppet_compiler/manifests/init.pp
3 files changed, 29 insertions(+), 24 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
Dzahn: Looks good to me, but someone else must approve
diff --git a/modules/puppet_compiler/manifests/bundle.pp
b/modules/puppet_compiler/manifests/bundle.pp
index bd15b0e..f724818 100644
--- a/modules/puppet_compiler/manifests/bundle.pp
+++ b/modules/puppet_compiler/manifests/bundle.pp
@@ -1,7 +1,9 @@
# Installs the deployment bundle needed by puppet
-define puppet_compiler::bundle( $program_dir = $puppet_compiler::program_dir )
{
- $installer="${program_dir}/shell/installer"
- exec {"install_puppet_bundle_${title}":
+define puppet_compiler::bundle(
+ $program_dir = $puppet_compiler::program_dir
+) {
+ $installer = "${program_dir}/shell/installer"
+ exec { "install_puppet_bundle_${title}":
command => "${installer} ${title}",
user => $puppet_compiler::user,
creates => "${program_dir}/shell/env_puppet_${title}/vendor",
diff --git a/modules/puppet_compiler/manifests/differ.pp
b/modules/puppet_compiler/manifests/differ.pp
index 492e9e7..2b07c74 100644
--- a/modules/puppet_compiler/manifests/differ.pp
+++ b/modules/puppet_compiler/manifests/differ.pp
@@ -1,10 +1,9 @@
class puppet_compiler::differ(
- $envdir = "${::puppet_compiler::program_dir}/shell/env_puppet_3",
+ $envdir = "${::puppet_compiler::program_dir}/shell/env_puppet_3",
$modulepath = "${::puppet_compiler::puppetdir}/modules",
- $user = $::puppet_compiler::user
- ) {
-
- exec {'Install catalog diff module':
+ $user = $::puppet_compiler::user
+) {
+ exec { 'Install catalog diff module':
command => "/usr/bin/bundle exec puppet module install
zack-catalog_diff --modulepath=${modulepath}",
cwd => $envdir,
user => $user,
diff --git a/modules/puppet_compiler/manifests/init.pp
b/modules/puppet_compiler/manifests/init.pp
index 13cd1e0..dfd68f6 100644
--- a/modules/puppet_compiler/manifests/init.pp
+++ b/modules/puppet_compiler/manifests/init.pp
@@ -2,7 +2,7 @@
class puppet_compiler(
$version = '0.1.0',
$rootdir = '/opt/wmf',
- $ensure = present,
+ $ensure = 'present',
$user = 'www-data'
) {
@@ -10,14 +10,14 @@
$install_dir = "${rootdir}/software"
$program_dir = "${install_dir}/compare-puppet-catalogs"
- $puppetdir = "${program_dir}/external/puppet"
+ $puppetdir = "${program_dir}/external/puppet"
nginx::site {'puppet-compiler':
ensure => $ensure,
content => template('puppet_compiler/nginx_site.erb'),
}
- file_line {'modify_nginx_magic_types':
+ file_line { 'modify_nginx_magic_types':
path => '/etc/nginx/mime.types',
line => "\ttext/plain\t\t\t\ttxt pson warnings out diff formatted;",
match => "\ttext/plain\t\t\t\ttxt",
@@ -26,7 +26,7 @@
}
# This wrapper defines the env variables for running.
- file {'run_wrapper':
+ file { 'run_wrapper':
ensure => $ensure,
path => '/usr/local/bin/puppet-compiler',
content => template('puppet_compiler/run_wrapper.erb'),
@@ -35,30 +35,30 @@
if $ensure != 'present' {
- file{'root_dir':
- ensure => 'absent',
+ file { 'root_dir':
+ ensure => absent,
path => $rootdir,
owner => $user,
recurse => true,
force => true,
}
} else {
- file{'root_dir':
- ensure => 'directory',
+ file { 'root_dir':
+ ensure => directory,
path => $rootdir,
owner => $user,
before => Git::Install['operations/software'],
}
- git::install {'operations/software':
- ensure => 'present',
+ git::install { 'operations/software':
+ ensure => present,
directory => $install_dir,
owner => $user,
git_tag => "compare-puppet-catalogs-${version}",
require => Nginx::Site['puppet-compiler'],
}
- exec {'install_puppet_compare_requirements':
+ exec { 'install_puppet_compare_requirements':
command => '/usr/bin/pip install requests simplediff',
user => 'root',
require => Git::Install['operations/software'],
@@ -68,7 +68,7 @@
# Now install the puppet repo
- exec {'install_puppet_repositories':
+ exec { 'install_puppet_repositories':
command => "${program_dir}/shell/helper install",
user => $user,
creates => $puppetdir,
@@ -76,15 +76,19 @@
notify => Class['puppet_compiler::differ']
}
- class {'::puppetmaster::scripts':
+ class { '::puppetmaster::scripts':
require => Exec['install_puppet_repositories']
}
- class {'puppet_compiler::differ':
+ class { 'puppet_compiler::differ':
require =>
[Exec['install_puppet_repositories'],Class['::puppetmaster::scripts']]
}
- file {["${program_dir}/output",
"${program_dir}/output/html","${program_dir}/output/diff",
"${program_dir}/output/compiled",]:
+ file {[ "${program_dir}/output",
+ "${program_dir}/output/html",
+ "${program_dir}/output/diff",
+ "${program_dir}/output/compiled",
+ ]:
ensure => directory,
owner => $user,
mode => '0775',
@@ -92,7 +96,7 @@
}
$mysql_query = template('puppet_compiler/mysql_queries.erb')
- exec {'mysql queries':
+ exec { 'mysql queries':
command => "/usr/bin/mysql -NBe ${mysql_query}",
unless => "/usr/bin/mysql puppet -NBe 'SELECT 1' ",
require => Package['mysql-server']
--
To view, visit https://gerrit.wikimedia.org/r/195660
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I25f6e1b36c7f0870d3ade3356792d22553d3521a
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <mata...@foss.co.il>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
