Doesn't need a specific kernel like ProxmoxV3. There is only a 4.x kernel.

This commit is contained in:
gardouille 2015-12-10 10:21:31 +01:00
parent fb0df1fb52
commit c6a65891c4
6 changed files with 16 additions and 41 deletions

View File

@ -8,3 +8,4 @@
##### Changes ##### Changes
* Now use "proxmox4::…" instead of "proxmox::…" * Now use "proxmox4::…" instead of "proxmox::…"
* Doesn't need a specific kernel like ProxmoxV3. There is only a 4.x kernel.

View File

@ -56,12 +56,11 @@ include proxmox4::hypervisor
``` ```
**Note**: The module will NOT automatically reboot the system on the PVE Kernel. You will need to reboot it manually and start again the puppet agent. **Note**: The module will NOT automatically reboot the system on the PVE Kernel. You will need to reboot it manually and start again the puppet agent.
#### KVM only #### Install a new hypervisor
If you will use only KVM you can have a most recent kernel with: To install Proxmox with the default parameters:
``` ```
class { 'proxmox4::hypervisor': class { 'proxmox4::hypervisor':
kvm_only => true,
} }
``` ```
@ -73,13 +72,12 @@ class { 'proxmox4::hypervisor':
} }
``` ```
#### Create a cluster full KVM (for Ceph) #### Create a cluster full (for Ceph)
``` ```
node "pve_node" { node "pve_node" {
# Install an hypervisor full KVM # Install an hypervisor
class { 'proxmox4::hypervisor': class { 'proxmox4::hypervisor':
pveproxy_allow => '127.0.0.1,192.168.0.0/24', pveproxy_allow => '127.0.0.1,192.168.0.0/24',
kvm_only => true,
cluster_master_ip => '192.168.0.201', cluster_master_ip => '192.168.0.201',
cluster_name => 'DeepThought', cluster_name => 'DeepThought',
} }
@ -192,9 +190,7 @@ proxmox4::hypervisor::user { 'marvin':
* `ve_pkg_ensure`: What to set the Virtual Environnment package to. Can be 'present', 'absent' or 'version'. Defaults to 'present'. * `ve_pkg_ensure`: What to set the Virtual Environnment package to. Can be 'present', 'absent' or 'version'. Defaults to 'present'.
* `ve_pkg_name`: The list of VirtualEnvironnment packages. Can be an array [ 'proxmox-ve-2.6.32', 'ksm-control-daemon', 'vzprocps', 'open-iscsi', 'bootlogd', 'pve-firmware' ]. * `ve_pkg_name`: The list of VirtualEnvironnment packages. Can be an array [ 'proxmox-ve-2.6.32', 'ksm-control-daemon', 'vzprocps', 'open-iscsi', 'bootlogd', 'pve-firmware' ].
* `kvm_only`: If set to 'true', Puppet will install a newer kernel compatible only with KVM. Accepts 'true' or 'false'. Defaults to 'false'. * `kernel_pkg_name`: The list of packages to install the new PVE kernel. Can be an array [ 'pve-kernel-4.2.6-1-pve', '...' ].
* `kernel_kvm_pkg_name`: The list of packages to install the newer kernel. Can be an array [ 'pve-kernel-3.10.0-13-pve', '...' ].
* `kernel_pkg_name`: The list of packages to install a kernel compatible with both KVM and OpenVZ. Can be an array [ 'pve-kernel-2.6.32-43-pve', '...' ].
* `rec_pkg_name`: The list of recommended and usefull packages for Proxmox. Can be an array [ 'ntp', 'ssh', 'lvm2', 'bridge-utils' ]. * `rec_pkg_name`: The list of recommended and usefull packages for Proxmox. Can be an array [ 'ntp', 'ssh', 'lvm2', 'bridge-utils' ].
* `old_pkg_ensure`: What to set useless packages (non recommended, previous kernel, ...). Can be 'present' or 'absent'. Defaults to 'absent'. * `old_pkg_ensure`: What to set useless packages (non recommended, previous kernel, ...). Can be 'present' or 'absent'. Defaults to 'absent'.
* `old_pkg_name`: The list of useless packages. Can be an array [ 'acpid', 'linux-image-amd64', 'linux-base', 'linux-image-3.2.0-4-amd64' ]. * `old_pkg_name`: The list of useless packages. Can be an array [ 'acpid', 'linux-image-amd64', 'linux-base', 'linux-image-3.2.0-4-amd64' ].

View File

@ -24,7 +24,6 @@
# === Examples # === Examples
# #
# class { '::proxmox4::hypervisor': # class { '::proxmox4::hypervisor':
# kvm_only => true,
# } # }
# #
# === Authors # === Authors
@ -38,8 +37,6 @@
class proxmox4::hypervisor ( class proxmox4::hypervisor (
$ve_pkg_ensure = $proxmox4::params::ve_pkg_ensure, $ve_pkg_ensure = $proxmox4::params::ve_pkg_ensure,
$ve_pkg_name = $proxmox4::params::ve_pkg_name, $ve_pkg_name = $proxmox4::params::ve_pkg_name,
$kvm_only = $proxmox4::params::kvm_only,
$kernel_kvm_pkg_name = $proxmox4::params::kernel_kvm_pkg_name,
$kernel_pkg_name = $proxmox4::params::kernel_pkg_name, $kernel_pkg_name = $proxmox4::params::kernel_pkg_name,
$rec_pkg_name = $proxmox4::params::rec_pkg_name, $rec_pkg_name = $proxmox4::params::rec_pkg_name,
$old_pkg_ensure = $proxmox4::params::old_pkg_ensure, $old_pkg_ensure = $proxmox4::params::old_pkg_ensure,

View File

@ -35,18 +35,6 @@ class proxmox4::hypervisor::install {
# You will need to update your PVE kernel manually. # You will need to update your PVE kernel manually.
# Installation of the PVE Kernel # Installation of the PVE Kernel
if $proxmox4::hypervisor::kvm_only == true {
notify { 'Please REBOOT':
message => "Need to REBOOT the system on the new PVE kernel (${proxmox4::hypervisor::kernel_kvm_pkg_name}) ...",
loglevel => warning,
}
->
package { $proxmox4::hypervisor::kernel_kvm_pkg_name:
ensure => $proxmox4::hypervisor::ve_pkg_ensure,
notify => Exec['update_grub'],
}
}
else {
notify { 'Please REBOOT': notify { 'Please REBOOT':
message => "Need to REBOOT the system on the new PVE kernel (${proxmox4::hypervisor::kernel_pkg_name}) ...", message => "Need to REBOOT the system on the new PVE kernel (${proxmox4::hypervisor::kernel_pkg_name}) ...",
loglevel => warning, loglevel => warning,
@ -58,7 +46,6 @@ class proxmox4::hypervisor::install {
} }
# 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
}
} }

View File

@ -9,9 +9,7 @@ class proxmox4::params {
$ve_pkg_name = [ 'proxmox-ve-2.6.32', 'ksm-control-daemon', 'vzprocps', 'open-iscsi', 'bootlogd', 'pve-firmware' ] $ve_pkg_name = [ 'proxmox-ve-2.6.32', 'ksm-control-daemon', 'vzprocps', 'open-iscsi', 'bootlogd', 'pve-firmware' ]
# PVE Kernel # PVE Kernel
$kvm_only = false $kernel_pkg_name = [ 'pve-kernel-4.2.6-1-pve' ]
$kernel_kvm_pkg_name = [ 'pve-kernel-3.10.0-13-pve' ]
$kernel_pkg_name = [ 'pve-kernel-2.6.32-43' ]
# Recommended packages # Recommended packages
$rec_pkg_name = [ 'ntp', 'ssh', 'lvm2', 'bridge-utils' ] $rec_pkg_name = [ 'ntp', 'ssh', 'lvm2', 'bridge-utils' ]

View File

@ -1,4 +0,0 @@
class { 'proxmox4::hypervisor':
kvm_only => true,
}