From 4f433a021feff879377bd9970c436a3460738586 Mon Sep 17 00:00:00 2001 From: Matthew Wagoner Date: Mon, 26 Nov 2012 11:13:11 -0500 Subject: [PATCH] Clean up of minor puppet-lint warnings. Mostly documentation and parameterised class parameter complaints. Change-Id: I5b3ffa4ad3f707f385165c2d86c891c6bd4c1ae0 Reviewed-on: https://review.openstack.org/16901 Reviewed-by: James E. Blair Approved: Clark Boylan Reviewed-by: Clark Boylan Tested-by: Jenkins --- modules/etherpad_lite/manifests/init.pp | 2 +- modules/etherpad_lite/manifests/mysql.pp | 2 +- modules/etherpad_lite/manifests/site.pp | 2 +- modules/gerritbot/manifests/init.pp | 16 +++++++++------- modules/launchpad_sync/manifests/init.pp | 8 +++++--- modules/logrotate/manifests/file.pp | 2 ++ modules/logrotate/manifests/init.pp | 4 +++- modules/puppetboot/manifests/init.pp | 12 ++++++------ modules/ssh/manifests/init.pp | 16 ++++++++++------ modules/sudoers/manifests/init.pp | 2 ++ modules/ulimit/manifests/conf.pp | 7 ++++--- modules/ulimit/manifests/init.pp | 7 ++++--- modules/zuul/manifests/init.pp | 13 +++++++------ 13 files changed, 55 insertions(+), 38 deletions(-) diff --git a/modules/etherpad_lite/manifests/init.pp b/modules/etherpad_lite/manifests/init.pp index c030494ad8..f7a724ac44 100644 --- a/modules/etherpad_lite/manifests/init.pp +++ b/modules/etherpad_lite/manifests/init.pp @@ -47,7 +47,7 @@ class etherpad_lite ( require => [ Package['git'], File["${base_install_dir}"], - ], + ], } package { [ diff --git a/modules/etherpad_lite/manifests/mysql.pp b/modules/etherpad_lite/manifests/mysql.pp index 797e4a04ef..92138d6b30 100644 --- a/modules/etherpad_lite/manifests/mysql.pp +++ b/modules/etherpad_lite/manifests/mysql.pp @@ -1,7 +1,7 @@ # == Class: etherpad_lite::mysql # class etherpad_lite::mysql( - $database_password, + $database_password = '', $dbType = 'mysql', $database_user = 'eplite', $database_name = 'etherpad-lite' diff --git a/modules/etherpad_lite/manifests/site.pp b/modules/etherpad_lite/manifests/site.pp index ad092b4c46..f2f47c1d03 100644 --- a/modules/etherpad_lite/manifests/site.pp +++ b/modules/etherpad_lite/manifests/site.pp @@ -1,7 +1,7 @@ # == Class: etherpad_lite::site # class etherpad_lite::site ( - $database_password, + $database_password = '', $dbType = 'mysql', $database_user = 'eplite', $database_name = 'etherpad-lite' diff --git a/modules/gerritbot/manifests/init.pp b/modules/gerritbot/manifests/init.pp index e166ef64d4..add7699466 100644 --- a/modules/gerritbot/manifests/init.pp +++ b/modules/gerritbot/manifests/init.pp @@ -1,16 +1,18 @@ +# == Class: gerritbot +# class gerritbot( - $nick, - $password, - $server, - $user, - $vhost_name + $nick = '', + $password = '', + $server = '', + $user = '', + $vhost_name = '' ) { include pip package { 'gerritbot': ensure => present, # Pip upgrade is not working provider => pip, - require => Class['pip'] + require => Class['pip'], } file { '/etc/init.d/gerritbot': @@ -30,7 +32,7 @@ class gerritbot( subscribe => [ Package['gerritbot'], File['/etc/gerritbot/gerritbot.config'], - File['/etc/gerritbot/channel_config.yaml'] + File['/etc/gerritbot/channel_config.yaml'], ], } diff --git a/modules/launchpad_sync/manifests/init.pp b/modules/launchpad_sync/manifests/init.pp index b3287bc49b..c5b38c2afc 100644 --- a/modules/launchpad_sync/manifests/init.pp +++ b/modules/launchpad_sync/manifests/init.pp @@ -1,7 +1,9 @@ +# == Class: launchpad_sync +# class launchpad_sync( - $root_team, - $script_logging_conf, - $site, + $root_team = '', + $script_logging_conf = '', + $site = '', $script_key_file = '/home/gerrit2/.ssh/id_rsa', $script_user = 'update', $user = 'gerrit2' diff --git a/modules/logrotate/manifests/file.pp b/modules/logrotate/manifests/file.pp index 6286fd861f..f7c0873131 100644 --- a/modules/logrotate/manifests/file.pp +++ b/modules/logrotate/manifests/file.pp @@ -1,3 +1,5 @@ +# == Define: logrotate::file +# define logrotate::file( $log, $options, $ensure=present, diff --git a/modules/logrotate/manifests/init.pp b/modules/logrotate/manifests/init.pp index 9410a27f9e..0d4da92ae8 100644 --- a/modules/logrotate/manifests/init.pp +++ b/modules/logrotate/manifests/init.pp @@ -1,5 +1,7 @@ +# == Class: logrotate +# # Adapted from http://projects.puppetlabs.com/projects/1/wiki/Logrotate_Patterns - +# class logrotate { package { 'logrotate': ensure => present, diff --git a/modules/puppetboot/manifests/init.pp b/modules/puppetboot/manifests/init.pp index 0d8bb1514b..634aae5740 100644 --- a/modules/puppetboot/manifests/init.pp +++ b/modules/puppetboot/manifests/init.pp @@ -1,11 +1,11 @@ +# == Class: puppetboot +# class puppetboot($ensure=present) { file {'/etc/init/puppetboot.conf': - owner => 'root', - group => 'root', - mode => 644, ensure => $ensure, - source => [ - "puppet:///modules/puppetboot/puppetboot.conf", - ], + owner => 'root', + group => 'root', + mode => '0644', + source => 'puppet:///modules/puppetboot/puppetboot.conf', } } diff --git a/modules/ssh/manifests/init.pp b/modules/ssh/manifests/init.pp index f05ceddc9c..2c6a54d3ee 100644 --- a/modules/ssh/manifests/init.pp +++ b/modules/ssh/manifests/init.pp @@ -1,3 +1,5 @@ +# == Class: ssh +# class ssh { package { 'openssh-server': ensure => present, @@ -8,12 +10,14 @@ class ssh { subscribe => File['/etc/ssh/sshd_config'], } file { '/etc/ssh/sshd_config': - ensure => present, - owner => 'root', - group => 'root', - mode => '0444', - source => [ "puppet:///modules/ssh/sshd_config.${::operatingsystem}", - 'puppet:///modules/ssh/sshd_config' ], + ensure => present, + owner => 'root', + group => 'root', + mode => '0444', + source => [ + "puppet:///modules/ssh/sshd_config.${::operatingsystem}", + 'puppet:///modules/ssh/sshd_config', + ], replace => true, } } diff --git a/modules/sudoers/manifests/init.pp b/modules/sudoers/manifests/init.pp index b8fc452da3..e1ddc3c85c 100644 --- a/modules/sudoers/manifests/init.pp +++ b/modules/sudoers/manifests/init.pp @@ -1,3 +1,5 @@ +# == Class: sudoers +# class sudoers { group { 'sudo': ensure => present, diff --git a/modules/ulimit/manifests/conf.pp b/modules/ulimit/manifests/conf.pp index 96ef42fefe..5e10422a3c 100644 --- a/modules/ulimit/manifests/conf.pp +++ b/modules/ulimit/manifests/conf.pp @@ -1,3 +1,5 @@ +# == Define: ulimit::conf +# define ulimit::conf ( $limit_domain, $limit_item, @@ -10,8 +12,7 @@ define ulimit::conf ( content => template('ulimit/limits.erb'), replace => true, owner => 'root', - mode => 0644, - require => File['/etc/security/limits.d'] + mode => '0644', + require => File['/etc/security/limits.d'], } - } diff --git a/modules/ulimit/manifests/init.pp b/modules/ulimit/manifests/init.pp index 54ae9cbe07..edb5f133c8 100644 --- a/modules/ulimit/manifests/init.pp +++ b/modules/ulimit/manifests/init.pp @@ -1,13 +1,14 @@ +# == Class: ulimit +# class ulimit { package { ['libpam-modules', 'libpam-modules-bin']: - ensure => present + ensure => present, } file { '/etc/security/limits.d': ensure => directory, owner => 'root', - mode => 0755 + mode => '0755', } - } diff --git a/modules/zuul/manifests/init.pp b/modules/zuul/manifests/init.pp index dd08ffb02a..da1a4d579d 100644 --- a/modules/zuul/manifests/init.pp +++ b/modules/zuul/manifests/init.pp @@ -1,11 +1,12 @@ # == Class: zuul +# class zuul ( - $jenkins_server, - $jenkins_user, - $jenkins_apikey, - $gerrit_server, - $gerrit_user, - $url_pattern, + $jenkins_server = '', + $jenkins_user = '', + $jenkins_apikey = '', + $gerrit_server = '', + $gerrit_user = '', + $url_pattern = '', $status_url = "https://${::fqdn}/zuul/status", $git_source_repo = 'https://github.com/openstack-ci/zuul.git', $push_change_refs = false