opendev/system-config
Code Issues Proposed changes

Updates for puppet style guide

Browse Source 
With the help of puppet-lint our base.pp manifest is now formatted
correctly per the puppet style guide.

Change-Id: I37de863b489bfd1b1a67b657a0749a5824ffe91d
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>
Reviewed-on: https://review.openstack.org/13603
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
Paul Belanger 2012-09-24 18:50:46 -04:00 committed by Jenkins
parent ea4c66ba9d
commit 30353ebac4
1 changed files with 44 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
modules/openstack_project/manifests/base.pp
View File

@ -1,4 +1,7 @@
class openstack_project::base($install_users=true, $certname=$fqdn) { class openstack_project::base(
$certname = $::fqdn,
$install_users = true
) {
include openstack_project::users include openstack_project::users
include sudoers include sudoers
@ -6,61 +9,67 @@ class openstack_project::base($install_users=true, $certname=$fqdn) {
ensure => 'absent' ensure => 'absent'
} }
package { "popularity-contest": package { 'popularity-contest':
ensure => purged ensure => purged
} }
if ( $lsbdistcodename == "oneiric" ) { if ($::lsbdistcodename == 'oneiric') {
include apt include apt
apt::ppa { 'ppa:git-core/ppa': } apt::ppa { 'ppa:git-core/ppa': }
package { "git": package { 'git':
ensure => latest, ensure => latest,
require => Apt::Ppa['ppa:git-core/ppa'] require => Apt::Ppa['ppa:git-core/ppa']
} }
} else { } else {
package { "git": package { 'git':
ensure => present, ensure => present,
} }
} }
$packages = ["puppet", $packages = [
"python-setuptools", 'puppet',
"python-virtualenv"] 'python-setuptools',
package { $packages: ensure => "present" } 'python-virtualenv'
]
package { $packages:
ensure => 'present'
}
if ($install_users) { if ($install_users) {
package { ['byobu', 'emacs23-nox']:
ensure => 'present'
}
package { ["byobu", "emacs23-nox"]: realize (
ensure => "present" User::Virtual::Localuser['mordred'],
} User::Virtual::Localuser['corvus'],
User::Virtual::Localuser['soren'],
realize ( User::Virtual::Localuser['linuxjedi'],
User::Virtual::Localuser["mordred"], User::Virtual::Localuser['devananda'],
User::Virtual::Localuser["corvus"], User::Virtual::Localuser['clarkb'],
User::Virtual::Localuser["soren"], )
User::Virtual::Localuser["linuxjedi"],
User::Virtual::Localuser["devananda"],
User::Virtual::Localuser["clarkb"],
)
} }
# Download and set up puppet apt repo # Download and set up puppet apt repo
exec { "download:puppetlabs-release-${lsbdistcodename}.deb": exec { "download:puppetlabs-release-$::{lsbdistcodename}.deb":
command => "/usr/bin/wget http://apt.puppetlabs.com/puppetlabs-release-${lsbdistcodename}.deb -O /root/puppetlabs-release-${lsbdistcodename}.deb", command => "/usr/bin/wget http://apt.puppetlabs.com/puppetlabs-release-$::{lsbdistcodename}.deb -O /root/puppetlabs-release-$::{lsbdistcodename}.deb",
creates => "/root/puppetlabs-release-${lsbdistcodename}.deb", creates => "/root/puppetlabs-release-$::{lsbdistcodename}.deb",
} }
exec { "dpkg:puppetlabs-release-${lsbdistcodename}.deb": exec { "dpkg:puppetlabs-release-$::{lsbdistcodename}.deb":
command => "/usr/bin/dpkg -i /root/puppetlabs-release-${lsbdistcodename}.deb", command => "/usr/bin/dpkg -i /root/puppetlabs-release-$::{lsbdistcodename}.deb",
onlyif => "/usr/bin/test ! -f /etc/apt/sources.list.d/puppetlabs.list", onlyif => '/usr/bin/test ! -f /etc/apt/sources.list.d/puppetlabs.list',
require => Exec["download:puppetlabs-release-${lsbdistcodename}.deb"], require => Exec["download:puppetlabs-release-$::{lsbdistcodename}.deb"],
} }
file { '/etc/puppet/puppet.conf': file { '/etc/puppet/puppet.conf':
owner => 'root', ensure => 'present',
group => 'root', owner => 'root',
mode => 444, group => 'root',
ensure => 'present', mode => '0444',
content => template('openstack_project/puppet.conf.erb'), content => template('openstack_project/puppet.conf.erb'),
replace => 'true', replace => true,
} }
} }
# vim:sw=2:ts=2:expandtab:textwidth=79