puppet/proxmox
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Correct puppet-lint warnings.

Browse Source
This commit is contained in:
gardouille 2015-02-03 16:56:39 +01:00
parent 875afdd9c0
commit 6c86d61854
7 changed files with 36 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -10,6 +10,7 @@
* The network management for an OpenVZ CT now works for all Debian family and not only Debian >=7. * The network management for an OpenVZ CT now works for all Debian family and not only Debian >=7.
* Modification in OpenVZ's configuration file notify the 'vz' service. * Modification in OpenVZ's configuration file notify the 'vz' service.
* Set an option to manage iptables modules in OpenVZ configuration. * Set an option to manage iptables modules in OpenVZ configuration.
* Correct puppet-lint warnings.
--------------------------------------- ---------------------------------------
### 0.2.0 - 2015/01/27 ### 0.2.0 - 2015/01/27

16
manifests/hypervisor/config.pp
View File

@ -19,24 +19,24 @@ class proxmox::hypervisor::config {
if $::is_proxmox == 'true' { if $::is_proxmox == 'true' {
# Pveproxy access control list # Pveproxy access control list
file { "${proxmox::hypervisor::pveproxy_default_path}": file { $proxmox::hypervisor::pveproxy_default_path:
ensure => present, ensure => present,
content => template("${proxmox::hypervisor::pveproxy_default_content}"), content => template($proxmox::hypervisor::pveproxy_default_content),
notify => Service["${proxmox::hypervisor::pveproxy_service_name}"], notify => Service[$proxmox::hypervisor::pveproxy_service_name],
} }
-> ->
# Remove the Subscription message # Remove the Subscription message
exec { 'remove_subscription_message': exec { 'remove_subscription_message':
command => 'rm -f /usr/share/pve-manager/ext4/pvemanagerlib.js.bak; sed -i".bak" -r -e "s/if \(data.status !== \'Active\'\) \{/if (false) {/" /usr/share/pve-manager/ext4/pvemanagerlib.js', command => 'rm -f /usr/share/pve-manager/ext4/pvemanagerlib.js.bak; sed -i".bak" -r -e "s/if \(data.status !== \'Active\'\) \{/if (false) {/" /usr/share/pve-manager/ext4/pvemanagerlib.js',
onlyif => 'grep "if (data.status !== \'Active\') {" /usr/share/pve-manager/ext4/pvemanagerlib.js', onlyif => 'grep "if (data.status !== \'Active\') {" /usr/share/pve-manager/ext4/pvemanagerlib.js',
} }
## OpenVZ configuration ## OpenVZ configuration
file { "${proxmox::hypervisor::vz_config_file_path}": file { $proxmox::hypervisor::vz_config_file_path:
ensure => present, ensure => present,
content => template("${proxmox::hypervisor::vz_config_file_tpl}"), content => template($proxmox::hypervisor::vz_config_file_tpl),
notify => Service["${proxmox::hypervisor::vz_service_name}"], notify => Service[$proxmox::hypervisor::vz_service_name],
} }
} }

4
manifests/hypervisor/group.pp
View File

@ -63,8 +63,8 @@ define proxmox::hypervisor::group ( $group = $title, $acl_path = '/', $permissio
} }
# The permissions file # The permissions file
if ! defined(File["${permission_file}"]) { if ! defined(File[$permission_file]) {
file { "${permission_file}": file { $permission_file:
ensure => present, ensure => present,
} }
} }

26
manifests/hypervisor/install.pp
View File

@ -19,19 +19,17 @@ class proxmox::hypervisor::install {
if $proxmox::hypervisor::kvm_only == true { if $proxmox::hypervisor::kvm_only == true {
notify { "Need to install a PVE kernel (${proxmox::hypervisor::kernel_kvm_pkg_name}) and reboot the system to run it ...": } notify { "Need to install a PVE kernel (${proxmox::hypervisor::kernel_kvm_pkg_name}) and reboot the system to run it ...": }
-> ->
# Don't use "${...}" because the kernel_kvm_pkg_name variable is an array
package { $proxmox::hypervisor::kernel_kvm_pkg_name: package { $proxmox::hypervisor::kernel_kvm_pkg_name:
ensure => "${proxmox::hypervisor::ve_pkg_ensure}", ensure => $proxmox::hypervisor::ve_pkg_ensure,
notify => Exec['update_grub','reboot_to_pve'], notify => Exec['update_grub','reboot_to_pve'],
} }
} }
else { else {
notify { "Need to install a PVE kernel (${proxmox::hypervisor::kernel_pkg_name}) and reboot the system to run it ...": } notify { "Need to install a PVE kernel (${proxmox::hypervisor::kernel_pkg_name}) and reboot the system to run it ...": }
-> ->
# Don't use "${...}" because the kernel_pkg_name variable is an array
package { $proxmox::hypervisor::kernel_pkg_name: package { $proxmox::hypervisor::kernel_pkg_name:
ensure => "${proxmox::hypervisor::ve_pkg_ensure}", ensure => $proxmox::hypervisor::ve_pkg_ensure,
notify => Exec['update_grub','grub_reboot'], notify => Exec['update_grub','grub_reboot'],
} }
# The kernel that allow KVM + OpenVZ is older than the standard Debian's # The kernel that allow KVM + OpenVZ is older than the standard Debian's
# kernel, so grub reboot must be used # kernel, so grub reboot must be used
@ -41,12 +39,12 @@ class proxmox::hypervisor::install {
# Installation of Virtual Environnment # Installation of Virtual Environnment
package { $proxmox::hypervisor::ve_pkg_name: package { $proxmox::hypervisor::ve_pkg_name:
ensure => "${proxmox::hypervisor::ve_pkg_ensure}", ensure => $proxmox::hypervisor::ve_pkg_ensure,
} -> } ->
# Remove useless packages (such as the standard kernel, acpid, ...) # Remove useless packages (such as the standard kernel, acpid, ...)
package { $proxmox::hypervisor::old_pkg_name: package { $proxmox::hypervisor::old_pkg_name:
ensure => "${proxmox::hypervisor::old_pkg_ensure}", ensure => $proxmox::hypervisor::old_pkg_ensure,
notify => Exec['update_grub'], notify => Exec['update_grub'],
} }
@ -54,30 +52,30 @@ class proxmox::hypervisor::install {
# come from Proxmox and standard Debian repository # come from Proxmox and standard Debian repository
if ! defined(Package["${proxmox::hypervisor::rec_pkg_name}"]) { if ! defined(Package["${proxmox::hypervisor::rec_pkg_name}"]) {
package { $proxmox::hypervisor::rec_pkg_name: package { $proxmox::hypervisor::rec_pkg_name:
ensure => "${proxmox::hypervisor::ve_pkg_ensure}", ensure => $proxmox::hypervisor::ve_pkg_ensure,
} }
} else { } else {
notice("Warning: cannot manage the installation of ${proxmox::hypervisor::rec_pkg_name}, as another resource (perhaps ...?) is managing it.") notice("Warn: can't manage ${proxmox::hypervisor::rec_pkg_name}.")
} }
} }
# Ensure the grub is update # Ensure the grub is update
exec { 'update_grub': exec { 'update_grub':
command => "update-grub", command => 'update-grub',
refreshonly => true, refreshonly => true,
} }
# Choose a different line in the grub # Choose a different line in the grub
exec { 'grub_reboot': exec { 'grub_reboot':
command => "grub-reboot 2", command => 'grub-reboot 2',
refreshonly => true, refreshonly => true,
notify => Exec['reboot_to_pve'], notify => Exec['reboot_to_pve'],
} }
# Reboot on a PVE Kernel # Reboot on a PVE Kernel
exec { 'reboot_to_pve': exec { 'reboot_to_pve':
command => "shutdown -r 1", command => 'shutdown -r 1',
refreshonly => true, refreshonly => true,
} }

10
manifests/hypervisor/preconfig.pp
View File

@ -17,7 +17,7 @@ class proxmox::hypervisor::preconfig {
#/files/etc/hosts/2/alias[1] = 'hypervisor' #/files/etc/hosts/2/alias[1] = 'hypervisor'
#/files/etc/hosts/1/ipaddr = '127.0.0.1' #/files/etc/hosts/1/ipaddr = '127.0.0.1'
#/files/etc/hosts/1/canonical = 'localhost' #/files/etc/hosts/1/canonical = 'localhost'
augeas { "${::fqdn}": augeas { $::fqdn:
context => '/files/etc/hosts', context => '/files/etc/hosts',
changes => [ changes => [
#"ins ipaddr ${::ipaddress}", #"ins ipaddr ${::ipaddress}",
@ -32,7 +32,7 @@ class proxmox::hypervisor::preconfig {
-> ->
# Remove Enterprise repository (need a subscription) # Remove Enterprise repository (need a subscription)
file { '/etc/apt/sources.list.d/pve-enterprise.list': file { '/etc/apt/sources.list.d/pve-enterprise.list':
ensure => "${proxmox::hypervisor::pve_enterprise_repo_ensure}", ensure => $proxmox::hypervisor::pve_enterprise_repo_ensure,
notify => Exec[apt_update], notify => Exec[apt_update],
} }
-> ->
@ -47,7 +47,7 @@ class proxmox::hypervisor::preconfig {
key_server => 'keyserver.ubuntu.com', key_server => 'keyserver.ubuntu.com',
} }
# Set the grub default to saved to be able to use grub-set-default during # Set the grub default to saved to be able to use grub-set-default during
# the installation # the installation
if ! defined(Augeas['grub_default']) { if ! defined(Augeas['grub_default']) {
augeas { 'grub_default': augeas { 'grub_default':
@ -66,9 +66,9 @@ class proxmox::hypervisor::preconfig {
$values = [ 'v1', 'v2' ] $values = [ 'v1', 'v2' ]
file { "${proxmox::hypervisor::pve_modules_file_path}": file { $proxmox::hypervisor::pve_modules_file_path:
ensure => present, ensure => present,
content => template("${proxmox::hypervisor::pve_modules_file_content}"), content => template($proxmox::hypervisor::pve_modules_file_content),
require => File['/etc/modules-load.d'], require => File['/etc/modules-load.d'],
} }

12
manifests/hypervisor/service.pp
View File

@ -21,18 +21,18 @@ class proxmox::hypervisor::service {
if $::is_proxmox == 'true' { if $::is_proxmox == 'true' {
if $proxmox::hypervisor::pveproxy_service_manage == true { if $proxmox::hypervisor::pveproxy_service_manage == true {
service { "${proxmox::hypervisor::pveproxy_service_name}": service { $proxmox::hypervisor::pveproxy_service_name:
ensure => "${pveproxy_service_ensure}", ensure => $pveproxy_service_ensure,
enable => "${proxmox::hypervisor::pveproxy_service_enabled}", enable => $proxmox::hypervisor::pveproxy_service_enabled,
hasstatus => false, hasstatus => false,
hasrestart => true, hasrestart => true,
} }
} }
if $proxmox::hypervisor::vz_service_manage == true { if $proxmox::hypervisor::vz_service_manage == true {
service { "${proxmox::hypervisor::vz_service_name}": service { $proxmox::hypervisor::vz_service_name:
ensure => "${vz_service_ensure}", ensure => $vz_service_ensure,
enable => "${proxmox::hypervisor::pveproxy_service_enabled}", enable => $proxmox::hypervisor::pveproxy_service_enabled,
hasstatus => true, hasstatus => true,
hasrestart => true, hasrestart => true,
} }

4
tests/group_management.pp
View File

@ -1,8 +1,8 @@
proxmox::hypervisor::group { 'sysadmin': proxmox::hypervisor::group { 'sysadmin':
role => "Administrator", role => 'Administrator',
users => [ 'user1@pam', 'toto@pve' ], users => [ 'user1@pam', 'toto@pve' ],
} }
proxmox::hypervisor::group { 'audit': proxmox::hypervisor::group { 'audit':
role => "PVEAuditor", role => 'PVEAuditor',
users => [ 'user2@pam' ], users => [ 'user2@pam' ],
} }