From 5812510ea7783b00ba02c873d38b126bceee104f Mon Sep 17 00:00:00 2001 From: Matthew Wagoner Date: Wed, 21 Nov 2012 14:53:55 -0500 Subject: [PATCH] Clean up of minor puppet-lint warnings. Mostly documentation and parameterised class parameter complaints. Change-Id: Idbfd348a5befb041ce6eb36f9c6b195fc0c6799f Reviewed-on: https://review.openstack.org/16685 Reviewed-by: Jeremy Stanley Approved: Monty Taylor Reviewed-by: Monty Taylor Tested-by: Jenkins --- modules/devstack_host/manifests/init.pp | 4 +++- modules/gerrit/manifests/init.pp | 14 +++++------ modules/github/manifests/init.pp | 14 ++++++----- modules/jenkins/manifests/jenkinsuser.pp | 2 +- modules/jenkins/manifests/job_builder.pp | 8 +++---- modules/jenkins/manifests/master.pp | 2 +- modules/jenkins/manifests/slave.pp | 4 ++-- modules/pypimirror/manifests/init.pp | 24 +++++++++++++------ modules/remove_nginx/manifests/init.pp | 2 ++ modules/tmpreaper/manifests/init.pp | 8 ++++--- modules/unattended_upgrades/manifests/init.pp | 2 ++ 11 files changed, 52 insertions(+), 32 deletions(-) diff --git a/modules/devstack_host/manifests/init.pp b/modules/devstack_host/manifests/init.pp index 1f4b236449..5a96c10e6f 100644 --- a/modules/devstack_host/manifests/init.pp +++ b/modules/devstack_host/manifests/init.pp @@ -1,3 +1,5 @@ +# == Class: devstack_host +# # A machine ready to run devstack class devstack_host { package { 'linux-headers-virtual': @@ -9,7 +11,7 @@ class devstack_host { } package { 'rabbitmq-server': - ensure => present, + ensure => present, require => File['/etc/rabbitmq/rabbitmq-env.conf'], } diff --git a/modules/gerrit/manifests/init.pp b/modules/gerrit/manifests/init.pp index 7cf341b736..ded3577748 100644 --- a/modules/gerrit/manifests/init.pp +++ b/modules/gerrit/manifests/init.pp @@ -67,10 +67,10 @@ # TODO: make more gerrit options configurable here class gerrit( - $war, - $mysql_password, - $mysql_root_password, - $email_private_key, + $war = '', + $mysql_password = '', + $mysql_root_password = '', + $email_private_key = '', $vhost_name = $::fqdn, $canonicalweburl = "https://${::fqdn}/", $serveradmin = "webmaster@${::fqdn}", @@ -84,8 +84,8 @@ class gerrit( $ssh_dsa_pubkey_contents = '', # If left empty puppet will not create file. $ssh_rsa_key_contents = '', # If left empty puppet will not create file. $ssh_rsa_pubkey_contents = '', # If left empty puppet will not create file. - $ssh_project_rsa_key_contents = '', # If left empty puppet will not create file. - $ssh_project_rsa_pubkey_contents = '', # If left empty puppet will not create file. + $ssh_project_rsa_key_contents = '', # If left empty will not create file. + $ssh_project_rsa_pubkey_contents = '', # If left empty will not create file. $openidssourl = 'https://login.launchpad.net/+openid', $email = '', $database_poollimit = '', @@ -367,7 +367,7 @@ class gerrit( owner => 'gerrit2', group => 'gerrit2', mode => '0644', - content => $ssh_rsa_project_pubkey_contents, + content => $ssh_project_rsa_pubkey_contents, replace => true, require => File['/home/gerrit2/review_site/etc'] } diff --git a/modules/github/manifests/init.pp b/modules/github/manifests/init.pp index ee56ce4219..dabceedab5 100644 --- a/modules/github/manifests/init.pp +++ b/modules/github/manifests/init.pp @@ -1,8 +1,10 @@ +# == Class: github +# class github( - $username, - $oauth_token, - $project_username, - $project_password, + $username = '', + $oauth_token = '', + $project_username = '', + $project_password = '', $projects = [] ) { include pip @@ -53,7 +55,7 @@ class github( replace => true, require => [ Group['github'], - File['/etc/github'] + File['/etc/github'], ], } @@ -66,7 +68,7 @@ class github( replace => true, require => [ Group['github'], - File['/etc/github'] + File['/etc/github'], ], } diff --git a/modules/jenkins/manifests/jenkinsuser.pp b/modules/jenkins/manifests/jenkinsuser.pp index 3a422d5227..fd7dfc9c77 100644 --- a/modules/jenkins/manifests/jenkinsuser.pp +++ b/modules/jenkins/manifests/jenkinsuser.pp @@ -1,7 +1,7 @@ # == Class: jenkins::jenkinsuser # class jenkins::jenkinsuser( - $ssh_key, + $ssh_key = '', $ensure = present, $sudo = false, ) { diff --git a/modules/jenkins/manifests/job_builder.pp b/modules/jenkins/manifests/job_builder.pp index 58039a0acf..09bc9ba7a3 100644 --- a/modules/jenkins/manifests/job_builder.pp +++ b/modules/jenkins/manifests/job_builder.pp @@ -1,9 +1,9 @@ # == Class: jenkins::job_builder # class jenkins::job_builder ( - $url, - $username, - $password, + $url = '', + $username = '', + $password = '', ) { # A lot of things need yaml, be conservative requiring this package to avoid @@ -47,7 +47,7 @@ class jenkins::job_builder ( File['/etc/jenkins_jobs/jenkins_jobs.ini'], Package['python-jenkins'], Package['python-yaml'], - ] + ], } # TODO: We should put in notify Exec['jenkins_jobs_update'] diff --git a/modules/jenkins/manifests/master.pp b/modules/jenkins/manifests/master.pp index c124a534fa..145d404845 100644 --- a/modules/jenkins/manifests/master.pp +++ b/modules/jenkins/manifests/master.pp @@ -1,7 +1,7 @@ # == Class: jenkins::master # class jenkins::master( - $logo, + $logo = '', $vhost_name = $::fqdn, $serveradmin = "webmaster@${::fqdn}", $ssl_cert_file = '', diff --git a/modules/jenkins/manifests/slave.pp b/modules/jenkins/manifests/slave.pp index a4f7f0824a..e19e629ac9 100644 --- a/modules/jenkins/manifests/slave.pp +++ b/modules/jenkins/manifests/slave.pp @@ -1,7 +1,7 @@ # == Class: jenkins::slave # class jenkins::slave( - $ssh_key, + $ssh_key = '', $sudo = false, $bare = false, $user = true, @@ -145,7 +145,7 @@ class jenkins::slave( require => [ Class['mysql::server'], Class['mysql::server::account_security'], - ] + ], } } diff --git a/modules/pypimirror/manifests/init.pp b/modules/pypimirror/manifests/init.pp index 6255a0e3d9..e4acd2234c 100644 --- a/modules/pypimirror/manifests/init.pp +++ b/modules/pypimirror/manifests/init.pp @@ -1,3 +1,5 @@ +# == Class: pypimorror +# class pypimirror( $vhost_name = $::fqdn, $log_filename = '/var/log/pypimirror.log', @@ -7,15 +9,15 @@ class pypimirror( $git_source = 'https://github.com', $local_git_dir = '/var/lib/git', $ssh_project_key = 'UNDEF', - $projects = [] ) -{ + $projects = [] +) { include apache include pip include remove_nginx package { 'python-yaml': - ensure => 'present' + ensure => present, } file { '/usr/local/mirror_scripts': @@ -59,8 +61,10 @@ class pypimirror( owner => 'root', group => 'root', content => template('pypimirror/run-mirror.sh.erb'), - require => [File['/usr/local/mirror_scripts'], - Class[pip]], + require => [ + File['/usr/local/mirror_scripts'], + Class[pip], + ], } file { '/usr/local/mirror_scripts/run_mirror.py': @@ -104,8 +108,14 @@ class pypimirror( include logrotate logrotate::file { 'pypimirror': log => $log_filename, - options => ['compress', 'delaycompress', 'missingok', 'rotate 7', - 'daily', 'notifempty'], + options => [ + 'compress', + 'delaycompress', + 'missingok', + 'rotate 7', + 'daily', + 'notifempty', + ], require => Cron['update_mirror'], } diff --git a/modules/remove_nginx/manifests/init.pp b/modules/remove_nginx/manifests/init.pp index 9dab56be5d..f794732f23 100644 --- a/modules/remove_nginx/manifests/init.pp +++ b/modules/remove_nginx/manifests/init.pp @@ -1,3 +1,5 @@ +# == Class: remove_nginx +# class remove_nginx { package { 'nginx': ensure => absent, diff --git a/modules/tmpreaper/manifests/init.pp b/modules/tmpreaper/manifests/init.pp index 1ac316e9f3..61b9c7fb1b 100644 --- a/modules/tmpreaper/manifests/init.pp +++ b/modules/tmpreaper/manifests/init.pp @@ -1,14 +1,16 @@ +# == Class: tmpreaper +# class tmpreaper() { package { 'tmpreaper': ensure => present, } file { '/etc/cron.daily/tmpreaper': - ensure => absent + ensure => absent, } file { '/usr/local/bin/tmpreaper.sh': - ensure => 'present', + ensure => present, owner => 'root', group => 'root', mode => '0755', @@ -16,7 +18,7 @@ class tmpreaper() { } file { '/etc/tmpreaper.conf': - ensure => 'present', + ensure => present, owner => 'root', group => 'root', mode => '0644', diff --git a/modules/unattended_upgrades/manifests/init.pp b/modules/unattended_upgrades/manifests/init.pp index 895b74447e..d04ffc008d 100644 --- a/modules/unattended_upgrades/manifests/init.pp +++ b/modules/unattended_upgrades/manifests/init.pp @@ -1,3 +1,5 @@ +# == Class: unattended_upgrades +# class unattended_upgrades($ensure = present) { package { 'unattended-upgrades': ensure => $ensure,