From 8bc467069a2244a7e96bef3ebd7f39e040ab2d03 Mon Sep 17 00:00:00 2001 From: Gardouille Date: Tue, 3 Feb 2015 18:03:46 +0100 Subject: [PATCH] * Update README.md. --- CHANGELOG.md | 10 ++++++++++ README.md | 13 +++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae88198..c480a1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,14 @@ +--------------------------------------- + +### + +##### Features + + +##### Changes +* Update README.md. + --------------------------------------- ### 0.2.1 - 2015/02/03 diff --git a/README.md b/README.md index ee0bdc1..3805bca 100644 --- a/README.md +++ b/README.md @@ -37,8 +37,10 @@ The proxmox module automates installing Proxmox on Debian systems. * The static table lookup for hostnames `hosts` * Users and group permissions for WebGUI. * WebGUI's service (pveproxy) -* Kernel modules loaded at the boot time -* OpenVZ network's configuration +* Kernel modules loaded at the boot time. +* OpenVZ's configuration file. +* OpenVZ's service. +* OpenVZ CT network's configuration. ### Beginning with Proxmox @@ -140,6 +142,13 @@ proxmox::hypervisor::user { 'marvin': * `pve_modules_list`: The list of additionnal modules to load at boot time. * `pve_modules_file_path`: The configuration file that will contain the modules list. Defaults to '/etc/modules-load.d/proxmox.conf'. * `pve_modules_file_content`: Template file used to generate the previous configuration file. Defaults to 'proxmox/hypervisor/proxmox_modules.conf.erb'. +* `vz_config_file_path`: Path of the main OpenVZ's configuration file. Defaults to '/etc/vz/vz.conf'. +* `vz_config_file_tpl`: Template file use to generate the OpenVZ's configuration file. Defaults to 'proxmox/hypervisor/vz.conf.erb'. +* `vz_iptables_modules`: If set to 'true', OpenVZ will share a list of iptables modules to the containers. Can be 'true' or 'false'. Defaults to 'true'. +* `vz_service_name`: The OpenVZ's service name. Defaults to 'vz'. +* `vz_service_manage`: If set to 'true', Puppet will manage the OpenVZ's service. Can be 'true' or 'false'. Defaults to 'true'. +* `vz_service_enabled`: If set to 'true', Puppet will ensure the OpenVZ's service is running. Can be 'true' or 'false'. Defaults to 'true'. +* `labs_firewall_rule`: If set to 'true', Puppet will set a iptable rule to allow WebGUI and VNC's port access. Can be 'true' or 'false'. Defaults to 'false'. #### proxmox::vm * `vm_interfaces_path`: The main network configuration's file. Defaults to '/etc/network/interfaces'.