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

Added support for $vmware_admin_group variable which defines unix group that has admin rights on vmware server.

Browse source
This commit is contained in:
Timo Mkinen 2009-11-19 21:29:06 +02:00
parent c750617b7a
commit 5860bef404
1 changed files with 42 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
vmware/manifests/server.pp
View file

@ -37,6 +37,26 @@ class vmware::server {
} }
} }
if $vmware_admin_group {
file { "/etc/vmware/ssl/rui.key":
ensure => present,
source => "${puppet_ssldir}/private_keys/${fqdn}.pem",
mode => 0640,
owner => root,
group => $vmware_admin_group,
require => [ Service["vmware"],
Class["puppet::client"], ],
notify => Exec["restart-vmware-mgmt"],
}
exec { "restart-vmware-mgmt":
command => "/etc/init.d/vmware-mgmt restart && sleep 10",
path => "/bin:/usr/bin:/sbin:/usr/sbin",
user => root,
refreshonly => true,
}
}
} }
@ -48,6 +68,11 @@ class vmware::server {
# #
class vmware::server::certs { class vmware::server::certs {
case $vmware_admin_group {
"": { $real_vmware_admin_group = "root" }
default: { $real_vmware_admin_group = $vmware_admin_group }
}
file { "/etc/vmware/ssl": file { "/etc/vmware/ssl":
ensure => directory, ensure => directory,
mode => 0755, mode => 0755,
@ -65,18 +90,7 @@ class vmware::server::certs {
require => [ File["/etc/vmware/ssl"], require => [ File["/etc/vmware/ssl"],
Class["puppet::client"], ], Class["puppet::client"], ],
before => Service["vmware"], before => Service["vmware"],
notify => Service["vmware"], notify => Exec["restart-vmware-mgmt"],
}
file { "/etc/vmware/ssl/rui.key":
ensure => present,
source => "${puppet_ssldir}/private_keys/${fqdn}.pem",
mode => 0600,
owner => root,
group => root,
require => [ File["/etc/vmware/ssl"],
Class["puppet::client"], ],
before => Service["vmware"],
notify => Service["vmware"],
} }
} }
@ -163,10 +177,15 @@ class vmware::server::vmfs {
# #
define vmware::server::datastore($device, $type = "auto", $options = "defaults") { define vmware::server::datastore($device, $type = "auto", $options = "defaults") {
include vmware::server::vmfs include vmware::server::vmfs
if $type == "auto" { case $vmware_admin_group {
$server = regsubst($device, '^([a-zA-Z0-9\-]+):(/.+)$', '\1') "": { $real_vmware_admin_group = "root" }
default: { $real_vmware_admin_group = $vmware_admin_group }
}
if $type == "auto" {
$server = regsubst($device, '^([a-zA-Z0-9\-]+):(/.+)$', '\1')
if $server == $device { if $server == $device {
$fstype = $type $fstype = $type
if $device == regsubst($device, '^(/dev/).+$', '\1') { if $device == regsubst($device, '^(/dev/).+$', '\1') {
@ -184,9 +203,15 @@ define vmware::server::datastore($device, $type = "auto", $options = "defaults")
file { "/vmfs/volumes/${name}": file { "/vmfs/volumes/${name}":
ensure => directory, ensure => directory,
mode => 0755, mode => $fstype ? {
nfs => 0755,
default => 0775,
},
owner => root, owner => root,
group => root, group => $fstype ? {
nfs => "root",
default => $real_vmware_admin_group,
},
require => File["/vmfs/volumes"], require => File["/vmfs/volumes"],
} }