opendev/puppet-dashboard
Code Issues Proposed changes

Fix puppet lint style guide violations

Browse Source
This commit is contained in:
William Van Hevelingen 2012-05-12 12:54:12 -07:00
parent aaecfd44f7
commit 97b76641b1
6 changed files with 56 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
manifests/init.pp
View File

@ -56,6 +56,7 @@ class dashboard (
$dashboard_charset = $dashboard::params::dashboard_charset, $dashboard_charset = $dashboard::params::dashboard_charset,
$dashboard_site = $dashboard::params::dashboard_site, $dashboard_site = $dashboard::params::dashboard_site,
$dashboard_port = $dashboard::params::dashboard_port, $dashboard_port = $dashboard::params::dashboard_port,
$dashboard_config = $dashboard::params::dashboard_config,
$mysql_root_pw = $dashboard::params::mysql_root_pw, $mysql_root_pw = $dashboard::params::mysql_root_pw,
$passenger = $dashboard::params::passenger, $passenger = $dashboard::params::passenger,
$mysql_package_provider = $dashboard::params::mysql_package_provider, $mysql_package_provider = $dashboard::params::mysql_package_provider,
@ -76,7 +77,7 @@ class dashboard (
-> Class['mysql::ruby'] -> Class['mysql::ruby']
-> Class['mysql::server'] -> Class['mysql::server']
-> Package[$dashboard_package] -> Package[$dashboard_package]
-> Mysql::DB["${dashboard_db}"] -> Mysql::DB[$dashboard_db]
-> File["${dashboard::params::dashboard_root}/config/database.yml"] -> File["${dashboard::params::dashboard_root}/config/database.yml"]
-> Exec['db-migrate'] -> Exec['db-migrate']
-> Class['dashboard::passenger'] -> Class['dashboard::passenger']
@ -91,34 +92,20 @@ class dashboard (
-> Class['mysql::ruby'] -> Class['mysql::ruby']
-> Class['mysql::server'] -> Class['mysql::server']
-> Package[$dashboard_package] -> Package[$dashboard_package]
-> Mysql::DB["${dashboard_db}"] -> Mysql::DB[$dashboard_db]
-> File["${dashboard::params::dashboard_root}/config/database.yml"] -> File["${dashboard::params::dashboard_root}/config/database.yml"]
-> Exec['db-migrate'] -> Exec['db-migrate']
-> Service[$dashboard_service] -> Service[$dashboard_service]
case $operatingsystem { file { 'dashboard_config':
'centos','redhat','oel': { ensure => present,
file { '/etc/sysconfig/puppet-dashboard': path => $dashboard_config,
ensure => present, content => template("dashboard/config.${::osfamily}.erb"),
content => template('dashboard/puppet-dashboard-sysconfig'), owner => '0',
owner => '0', group => '0',
group => '0', mode => '0644',
mode => '0644', require => [ Package[$dashboard_package], User[$dashboard_user] ],
require => [ Package[$dashboard_package], User[$dashboard_user] ], before => Service[$dashboard_service],
before => Service[$dashboard_service],
}
}
'debian','ubuntu': {
file { '/etc/default/puppet-dashboard':
ensure => present,
content => template('dashboard/puppet-dashboard.default.erb'),
owner => '0',
group => '0',
mode => '0644',
require => [ Package[$dashboard_package], User[$dashboard_user] ],
before => Service[$dashboard_service],
}
}
} }
service { $dashboard_service: service { $dashboard_service:
@ -171,22 +158,22 @@ class dashboard (
} }
exec { 'db-migrate': exec { 'db-migrate':
command => "rake RAILS_ENV=production db:migrate", command => 'rake RAILS_ENV=production db:migrate',
cwd => "${dashboard::params::dashboard_root}", cwd => $dashboard::params::dashboard_root,
path => "/usr/bin/:/usr/local/bin/", path => '/usr/bin/:/usr/local/bin/',
creates => "/var/lib/mysql/${dashboard_db}/nodes.frm", creates => "/var/lib/mysql/${dashboard_db}/nodes.frm",
} }
mysql::db { "${dashboard_db}": mysql::db { $dashboard_db:
user => $dashboard_user, user => $dashboard_user,
password => $dashboard_password, password => $dashboard_password,
charset => $dashboard_charset, charset => $dashboard_charset,
} }
user { $dashboard_user: user { $dashboard_user:
comment => 'Puppet Dashboard',
gid => "${dashboard_group}",
ensure => 'present', ensure => 'present',
comment => 'Puppet Dashboard',
gid => $dashboard_group,
shell => '/sbin/nologin', shell => '/sbin/nologin',
managehome => true, managehome => true,
home => "/home/${dashboard_user}", home => "/home/${dashboard_user}",

24
manifests/params.pp
View File

@ -13,33 +13,41 @@
class dashboard::params { class dashboard::params {
$dashboard_ensure = 'present' $dashboard_ensure = 'present'
$dashboard_user = "puppet-dashboard" $dashboard_user = 'puppet-dashboard'
$dashboard_group = "puppet-dashboard" $dashboard_group = 'puppet-dashboard'
$dashboard_password = "changeme" $dashboard_password = 'changeme'
$dashboard_db = 'dashboard_production' $dashboard_db = 'dashboard_production'
$dashboard_charset = 'utf8' $dashboard_charset = 'utf8'
$dashboard_environment = 'production' $dashboard_environment = 'production'
$dashboard_site = "${fqdn}" $dashboard_site = $::fqdn
$dashboard_port = '8080' $dashboard_port = '8080'
$passenger = false $passenger = false
$mysql_root_pw = 'changemetoo' $mysql_root_pw = 'changemetoo'
$rails_base_uri = '/' $rails_base_uri = '/'
case $operatingsystem { case $::osfamily {
'centos', 'redhat', 'fedora': {
'RedHat': {
$dashboard_config = '/etc/sysconfig/puppet-dashboard'
$dashboard_service = 'puppet-dashboard' $dashboard_service = 'puppet-dashboard'
$dashboard_package = 'puppet-dashboard' $dashboard_package = 'puppet-dashboard'
$dashboard_root = '/usr/share/puppet-dashboard' $dashboard_root = '/usr/share/puppet-dashboard'
$mysql_package_provider = 'yum' $mysql_package_provider = 'yum'
$ruby_mysql_package = 'ruby-mysql' $ruby_mysql_package = 'ruby-mysql'
} }
'ubuntu', 'debian': {
'Debian': {
$dashboard_config = '/etc/default/puppet-dashboard'
$dashboard_service = 'puppet-dashboard' $dashboard_service = 'puppet-dashboard'
$dashboard_package = 'puppet-dashboard' $dashboard_package = 'puppet-dashboard'
$dashboard_root = '/usr/share/puppet-dashboard' $dashboard_root = '/usr/share/puppet-dashboard'
$mysql_package_provider = 'aptitude' $mysql_package_provider = 'aptitude'
$ruby_mysql_package = 'libmysql-ruby1.8' $ruby_mysql_package = 'libmysql-ruby1.8'
} }
}
default: {
fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily RedHat and Debian")
}
}
} }

23
manifests/passenger.pp
View File

@ -14,31 +14,24 @@
# #
class dashboard::passenger ( class dashboard::passenger (
$dashboard_site, $dashboard_site,
$dashboard_port $dashboard_port,
$dashboard_config = $dashboard::params::dashboard_config
) inherits dashboard { ) inherits dashboard {
Class ['::passenger'] Class ['::passenger']
-> Apache::Vhost[$dashboard_site] -> Apache::Vhost[$dashboard_site]
class { '::passenger': class { '::passenger':
port => $dashboard_port, port => $dashboard_port,
} }
file { '/etc/init.d/puppet-dashboard': file { '/etc/init.d/puppet-dashboard':
ensure => absent, ensure => absent,
} }
case $operatingsystem { file { 'dashboard_config':
'centos','redhat','oel': { ensure => absent,
file { '/etc/sysconfig/puppet-dashboard': path => $dashboard_config,
ensure => absent,
}
}
'debian','ubuntu': {
file { '/etc/default/puppet-dashboard':
ensure => absent,
}
}
} }
apache::vhost { $dashboard_site: apache::vhost { $dashboard_site:
@ -48,4 +41,4 @@ class dashboard::passenger (
template => 'dashboard/puppet-dashboard-passenger-vhost.erb', template => 'dashboard/puppet-dashboard-passenger-vhost.erb',
} }
} }

0
templates/puppet-dashboard.default.erb → templates/config.Debian.erb
View File

0
templates/puppet-dashboard-sysconfig → templates/config.RedHat.erb
View File

28
tests/init.pp
View File

@ -1,19 +1,19 @@
node default { node default {
class {'dashboard': class { 'dashboard':
dashboard_ensure => 'present', dashboard_ensure => 'present',
dashboard_user => 'puppet-dbuser', dashboard_user => 'puppet-dbuser',
dashboard_group => 'puppet-dbgroup', dashboard_group => 'puppet-dbgroup',
dashboard_password => 'changeme', dashboard_password => 'changeme',
dashboard_db => 'dashboard_prod', dashboard_db => 'dashboard_prod',
dashboard_charset => 'utf8', dashboard_charset => 'utf8',
dashboard_site => $fqdn, dashboard_site => $fqdn,
dashboard_port => '8080', dashboard_port => '8080',
mysql_root_pw => 'changemetoo', mysql_root_pw => 'changemetoo',
passenger => true, passenger => true,
mysql_package_provider => 'yum', mysql_package_provider => 'yum',
ruby_mysql_package => 'ruby-mysql', ruby_mysql_package => 'ruby-mysql',
} }
} }