tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixing puppet-lint errors.

Browse source
This commit is contained in:
Timo Mkinen 2012-03-27 14:41:39 +03:00
parent 2f83cb7d4a
commit 34c36045fa
59 changed files with 995 additions and 990 deletions
Download patch file Download diff file Expand all files Collapse all files

18
vmware/manifests/guest.pp
View file

@ -4,12 +4,12 @@
class vmware::guest {
case $virtual {
vmware: {
case $operatingsystem {
centos: { include vmware::guest::centos }
fedora: { include vmware::guest::fedora }
}
}
vmware: {
case $operatingsystem {
centos: { include vmware::guest::centos }
fedora: { include vmware::guest::fedora }
}
}
}
}
@ -46,11 +46,11 @@ class vmware::guest::centos {
class vmware::guest::fedora {
package { "VMwareTools":
ensure => absent,
ensure => absent,
}
package { "open-vm-tools":
ensure => installed,
require => Package["VMwareTools"],
ensure => installed,
require => Package["VMwareTools"],
}
}

2
vmware/manifests/player.pp
View file

@ -9,5 +9,5 @@
class vmware::player {
vmware::bundle { "VMware-Player": }
}

208
vmware/manifests/server.pp
View file

@ -2,50 +2,50 @@
class vmware::server {
package { "VMware-server":
ensure => installed,
ensure => installed,
}
service { "vmware":
ensure => running,
enable => true,
hasstatus => true,
start => "pkill 'vmnet-' ; /sbin/service vmware stop ; rm -f /etc/vmware/not_configured ; /sbin/service vmware start && sleep 5",
stop => "pkill 'vmnet-' ; /sbin/service vmware stop",
require => [ Package["VMware-server"],
Exec["vmware-config.pl"], ],
ensure => running,
enable => true,
hasstatus => true,
start => "pkill 'vmnet-' ; /sbin/service vmware stop ; rm -f /etc/vmware/not_configured ; /sbin/service vmware start && sleep 5",
stop => "pkill 'vmnet-' ; /sbin/service vmware stop",
require => [ Package["VMware-server"],
Exec["vmware-config.pl"], ],
}
# seems that vmware init script fails if pid files are missing for vmnet
# processes, so kill them by force first
exec { "vmware-config.pl":
command => "pkill 'vmnet-' ; perl /usr/bin/vmware-config.pl --default EULA_AGREED=yes && rm -f /etc/vmware/not_configured",
path => "/bin:/usr/bin:/sbin:/usr/sbin",
command => "pkill 'vmnet-' ; perl /usr/bin/vmware-config.pl --default EULA_AGREED=yes && rm -f /etc/vmware/not_configured",
path => "/bin:/usr/bin:/sbin:/usr/sbin",
environment => [ "PAGER=/bin/cat", ],
unless => "test ! -f /etc/vmware/not_configured -a -f /lib/modules/$kernelrelease/misc/vmci.ko",
unless => "test ! -f /etc/vmware/not_configured -a -f /lib/modules/$kernelrelease/misc/vmci.ko",
require => Package["VMware-server"],
notify => Service["vmware"],
notify => Service["vmware"],
}
if $vmware_serial {
exec { "vmware-set-serial":
command => "/usr/lib/vmware/bin/vmware-vmx --new-sn ${vmware_serial}",
path => "/bin:/usr/bin:/sbin:/usr/sbin",
user => root,
creates => "/etc/vmware/license.vs.1.0-00",
require => Package["VMware-server"],
before => Exec["vmware-config.pl"],
}
exec { "vmware-set-serial":
command => "/usr/lib/vmware/bin/vmware-vmx --new-sn ${vmware_serial}",
path => "/bin:/usr/bin:/sbin:/usr/sbin",
user => root,
creates => "/etc/vmware/license.vs.1.0-00",
require => Package["VMware-server"],
before => Exec["vmware-config.pl"],
}
}
if $vmware_admin_group {
file { "/etc/vmware/ssl/rui.key":
ensure => present,
mode => 0640,
owner => root,
group => $vmware_admin_group,
require => [ Service["vmware"],
ensure => present,
mode => 0640,
owner => root,
group => $vmware_admin_group,
require => [ Service["vmware"],
Class["puppet::client"], ],
notify => Exec["restart-vmware-mgmt"],
notify => Exec["restart-vmware-mgmt"],
}
exec { "restart-vmware-mgmt":
command => "/etc/init.d/vmware-mgmt restart && sleep 10",
@ -73,21 +73,21 @@ class vmware::server::scripts {
include socat::package
define vmware::server::scripts::file {
file { "/usr/local/sbin/${name}":
ensure => present,
source => "puppet:///modules/vmware/scripts/${name}",
mode => 0755,
owner => root,
group => root,
}
file { "/usr/local/sbin/${name}":
ensure => present,
source => "puppet:///modules/vmware/scripts/${name}",
mode => 0755,
owner => root,
group => root,
}
}
file { "/usr/local/lib/vmware.sh":
ensure => present,
source => "puppet:///modules/vmware/scripts/vmware.sh",
mode => 0644,
owner => root,
group => root,
ensure => present,
source => "puppet:///modules/vmware/scripts/vmware.sh",
mode => 0644,
owner => root,
group => root,
}
vmware::server::scripts::file { "vmware-console": }
@ -112,18 +112,18 @@ class vmware::server::vmfs {
include vmware::server
file { "/vmfs":
ensure => directory,
mode => 0755,
owner => root,
group => root,
require => Package["VMware-server"],
ensure => directory,
mode => 0755,
owner => root,
group => root,
require => Package["VMware-server"],
}
file { "/vmfs/volumes":
ensure => directory,
mode => 0755,
owner => root,
group => root,
require => File["/vmfs"],
ensure => directory,
mode => 0755,
owner => root,
group => root,
require => File["/vmfs"],
}
}
@ -158,61 +158,61 @@ define vmware::server::datastore($device, $type = "auto", $options = "defaults")
if $type == "auto" {
$server = regsubst($device, '^([a-zA-Z0-9\-]+):(/.+)$', '\1')
if $server == $device {
$fstype = $type
if $device == regsubst($device, '^(/dev/).+$', '\1') {
$mountopts = "bind"
}
} else {
$fstype = "nfs"
$path = regsubst($device, '^([a-zA-Z0-9\-]+):(/.+)$', '\2')
}
if $server == $device {
$fstype = $type
if $device == regsubst($device, '^(/dev/).+$', '\1') {
$mountopts = "bind"
}
} else {
$fstype = "nfs"
$path = regsubst($device, '^([a-zA-Z0-9\-]+):(/.+)$', '\2')
}
}
if !$mountopts {
$mountopts = $options
$mountopts = $options
}
file { "/vmfs/volumes/${name}":
ensure => directory,
mode => $fstype ? {
ensure => directory,
mode => $fstype ? {
nfs => 0755,
default => 0775,
},
owner => root,
group => $fstype ? {
owner => root,
group => $fstype ? {
nfs => "root",
default => $real_vmware_admin_group,
},
require => File["/vmfs/volumes"],
require => File["/vmfs/volumes"],
}
mount { "/vmfs/volumes/${name}":
ensure => mounted,
device => "${device}",
fstype => "${fstype}",
options => "${mountopts}",
require => File["/vmfs/volumes/${name}"],
ensure => mounted,
device => $device,
fstype => $fstype,
options => $mountopts,
require => File["/vmfs/volumes/${name}"],
}
exec { "vmware-create-datastore-${name}":
command => $fstype ? {
nfs => "vmware-vim-cmd hostsvc/datastore/nas_create ${name} ${server} ${path} 0",
default => "vmware-vim-cmd hostsvc/datastore/localds_create ${name} /vmfs/volumes/${name}",
},
path => "/bin:/usr/bin:/sbin:/usr/sbin",
user => root,
unless => "vmware-vim-cmd hostsvc/datastore/summary ${name}",
require => [ Mount["/vmfs/volumes/${name}"],
Service["vmware"], ],
notify => Exec["vmware-refresh-datastore-${name}"],
command => $fstype ? {
nfs => "vmware-vim-cmd hostsvc/datastore/nas_create ${name} ${server} ${path} 0",
default => "vmware-vim-cmd hostsvc/datastore/localds_create ${name} /vmfs/volumes/${name}",
},
path => "/bin:/usr/bin:/sbin:/usr/sbin",
user => root,
unless => "vmware-vim-cmd hostsvc/datastore/summary ${name}",
require => [ Mount["/vmfs/volumes/${name}"],
Service["vmware"], ],
notify => Exec["vmware-refresh-datastore-${name}"],
}
exec { "vmware-refresh-datastore-${name}":
command => "vmware-vim-cmd hostsvc/datastore/refresh ${name}",
path => "/bin:/usr/bin:/sbin:/usr/sbin",
user => root,
refreshonly => true,
command => "vmware-vim-cmd hostsvc/datastore/refresh ${name}",
path => "/bin:/usr/bin:/sbin:/usr/sbin",
user => root,
refreshonly => true,
}
}
@ -229,7 +229,7 @@ define vmware::server::datastore($device, $type = "auto", $options = "defaults")
# $device:
# Physical network device to bridge.
# $ensure:
# Set to present to enable bridge and absent to disable it.
# Set to present to enable bridge and absent to disable it.
#
# === Sample usage
#
@ -243,35 +243,35 @@ define vmware::server::bridge($description, $device, $ensure = "present") {
$vmnet = regsubst($name, '^vmnet([0-9]+)$', '\1')
if $vmnet == $name {
fail("Invalid vmnet device name.")
fail("Invalid vmnet device name.")
}
service { "${name}-bridge":
ensure => $ensure ? {
"present" => running,
"absent" => stopped,
},
pattern => "/usr/bin/vmnet-bridge -d .* -n ${vmnet}",
start => "/usr/bin/vmnet-bridge -d /var/run/vmnet-bridge-${vmnet}.pid -n ${vmnet} -i ${device}",
stop => "pkill -f '/usr/bin/vmnet-bridge -d .* -n ${vmnet}'",
provider => base,
require => Exec["vmware-config.pl"],
ensure => $ensure ? {
"present" => running,
"absent" => stopped,
},
pattern => "/usr/bin/vmnet-bridge -d .* -n ${vmnet}",
start => "/usr/bin/vmnet-bridge -d /var/run/vmnet-bridge-${vmnet}.pid -n ${vmnet} -i ${device}",
stop => "pkill -f '/usr/bin/vmnet-bridge -d .* -n ${vmnet}'",
provider => base,
require => Exec["vmware-config.pl"],
}
vmware_config { "VNET_${vmnet}_NAME":
ensure => $ensure ? {
absent => absent,
present => "${description}",
},
require => Exec["vmware-config.pl"],
ensure => $ensure ? {
absent => absent,
present => $description,
},
require => Exec["vmware-config.pl"],
}
vmware_config { "VNET_${vmnet}_INTERFACE":
ensure => $ensure ? {
absent => absent,
present => "${device}",
},
notify => Service["${name}-bridge"],
require => Exec["vmware-config.pl"],
ensure => $ensure ? {
absent => absent,
present => $device,
},
notify => Service["${name}-bridge"],
require => Exec["vmware-config.pl"],
}
}