From 71312b261fa883943db1d8d2dbc88ec8a95d1a45 Mon Sep 17 00:00:00 2001 From: Gardouille Date: Tue, 3 Feb 2015 16:16:36 +0100 Subject: [PATCH] * Add vz service management. --- CHANGELOG.md | 1 + manifests/hypervisor.pp | 3 +++ manifests/hypervisor/service.pp | 16 ++++++++++++++++ manifests/params.pp | 3 +++ 4 files changed, 23 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7374255..50bc125 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ##### Features * Manage the main OpenVZ's configuration file (/etc/vz/vz.conf). +* Add vz service management. ##### Changes * The network management for an OpenVZ CT now works for all Debian family and not only Debian >=7. diff --git a/manifests/hypervisor.pp b/manifests/hypervisor.pp index 157d029..20d303e 100644 --- a/manifests/hypervisor.pp +++ b/manifests/hypervisor.pp @@ -58,6 +58,9 @@ class proxmox::hypervisor ( $pve_modules_file_content = $proxmox::params::pve_modules_file_content, $vz_config_file_path = $proxmox::params::vz_config_file_path, $vz_config_file_tpl = $proxmox::params::vz_config_file_tpl, + $vz_service_name = $proxmox::params::vz_service_name, + $vz_service_manage = $proxmox::params::vz_service_manage, + $vz_service_enabled = $proxmox::params::vz_service_enabled, $labs_firewall_rule = $proxmox::params::labs_firewall_rule, ) inherits proxmox::params { diff --git a/manifests/hypervisor/service.pp b/manifests/hypervisor/service.pp index c5c404e..dbd32e3 100644 --- a/manifests/hypervisor/service.pp +++ b/manifests/hypervisor/service.pp @@ -11,6 +11,13 @@ class proxmox::hypervisor::service { $pveproxy_service_ensure = 'stopped' } + if $proxmox::hypervisor::vz_service_enabled == true { + $vz_service_ensure = 'running' + } else { + $vz_service_ensure = 'stopped' + } + + if $::is_proxmox == 'true' { if $proxmox::hypervisor::pveproxy_service_manage == true { @@ -22,6 +29,15 @@ class proxmox::hypervisor::service { } } + if $proxmox::hypervisor::vz_service_manage == true { + service { "${proxmox::hypervisor::vz_service_name}": + ensure => "${vz_service_ensure}", + enable => "${proxmox::hypervisor::pveproxy_service_enabled}", + hasstatus => true, + hasrestart => true, + } + } + } diff --git a/manifests/params.pp b/manifests/params.pp index ca9a236..9fbcc24 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -41,6 +41,9 @@ class proxmox::params { # OpenVZ configuration $vz_config_file_path = '/etc/vz/vz.conf' $vz_config_file_tpl = 'proxmox/hypervisor/vz.conf.erb' + $vz_service_name = 'vz' + $vz_service_manage = true + $vz_service_enabled = true # Firewall $labs_firewall_rule = false