From 6801503b58cb23c81a1b562cea6f14e79d15b505 Mon Sep 17 00:00:00 2001 From: Gardouille Date: Fri, 9 Jan 2015 00:30:15 +0100 Subject: [PATCH] Correct indentation and double quote. Correct metadata.json This 0.0.2 version was successfully push to the forgelabs. --- CHANGELOG.md | 10 +++++++++- README.md | 4 +--- manifests/hypervisor/install.pp | 2 +- manifests/hypervisor/preconfig.pp | 8 ++++---- manifests/init.pp | 1 - metadata.json | 2 +- 6 files changed, 16 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f1aebc..fc1e78d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,21 @@ + --------------------------------------- ### 0.0.2 - 2014/01/08 -New functionality release, it's now install proxmox :) +New functionality release, Proxmox installation now working :) ##### Changes * (#1) Possibility to choose between newer kernel that only supports KVM or a ~2.6.32 that supports both KVM and OpenVZ. * (#1) Install the Virtual Environment and it's works with 2 puppet run. +* Add new test (hypervisor_kvm_only). +* Add a fact to check if Proxmox is "available". +* Add a new class: proxmox::hypervisor::config for some tiny configurations. +* Remove the subscription message in the web gui. +* Add operatingsystem_support information in the metadata.json (to correct the error in Metadata Quality). +* Correct wtfpl into WTFPL to be recognized by SPDX (Metadata Quality). +* Correct indentation, double quote, ... --------------------------------------- diff --git a/README.md b/README.md index 62597b9..ab9e0f2 100644 --- a/README.md +++ b/README.md @@ -26,9 +26,7 @@ To begin using proxmox module with default parameters, declare the hypervisor's ### Hypervisor ``` -class { 'proxmox::hypervisor': - -} +include proxmox::hypervisor ``` If you will use only KVM you can have a most recent kernel with: diff --git a/manifests/hypervisor/install.pp b/manifests/hypervisor/install.pp index e81c075..109c4b6 100644 --- a/manifests/hypervisor/install.pp +++ b/manifests/hypervisor/install.pp @@ -47,7 +47,7 @@ class proxmox::hypervisor::install { # Remove useless packages (such as the standard kernel, acpid, ...) package { $proxmox::hypervisor::old_pkg_name: ensure => "${proxmox::hypervisor::old_pkg_ensure}", - notify => Exec['update_grub'], + notify => Exec['update_grub'], } # Ensure that some recommended packages are present on the system diff --git a/manifests/hypervisor/preconfig.pp b/manifests/hypervisor/preconfig.pp index 851dd49..a3a84f3 100644 --- a/manifests/hypervisor/preconfig.pp +++ b/manifests/hypervisor/preconfig.pp @@ -27,7 +27,7 @@ class proxmox::hypervisor::preconfig { "set *[ipaddr = '127.0.0.1']/canonical localhost", "rm *[ipaddr = '127.0.1.1']", ], - onlyif => "match *[ipaddr = '${::ipaddress}'] size == 0", + onlyif => "match *[ipaddr = '${::ipaddress}'] size == 0", } -> # Remove Enterprise repository (need a subscription) @@ -49,10 +49,10 @@ class proxmox::hypervisor::preconfig { # Set the grub default to saved to be able to use grub-set-default during # the installation if ! defined(Augeas["grub_default"]) { - augeas { "grub_default": - context => "/files/etc/default/grub", + augeas { 'grub_default': + context => '/files/etc/default/grub', changes => [ - "set GRUB_DEFAULT saved", + 'set GRUB_DEFAULT saved', ], } } diff --git a/manifests/init.pp b/manifests/init.pp index 6ce593d..930acd5 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -18,7 +18,6 @@ # class proxmox { - notify { "hello world": } } # Public class: proxmox diff --git a/metadata.json b/metadata.json index 2a101f2..3de1bf4 100644 --- a/metadata.json +++ b/metadata.json @@ -10,7 +10,7 @@ "description": "Proxmox module", "operatingsystem_support": [ { - "operatingsystem":"Debian", "operatingsystemrelease":"7.0" + "operatingsystem":"Debian" } ], "dependencies": [