diff --git a/CHANGELOG.md b/CHANGELOG.md index 92cdb5a..b15cfed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +--------------------------------------- + +##### Changes +* Add examples in README.md file. +* Correct indentation, double quote, ... --------------------------------------- @@ -5,14 +10,14 @@ This release introduce new defined types: - proxmox::hypervisor::group { 'sysadmin': - role => 'Administrator', - users => [ 'root@pam', 'test@pve' ], - } + proxmox::hypervisor::group { 'sysadmin': + role => 'Administrator', + users => [ 'root@pam', 'test@pve' ], + } - proxmox::hypervisor::user { 'toto@pve': - group => 'sysadmin', - } + proxmox::hypervisor::user { 'toto@pve': + group => 'sysadmin', + } And also directly jump to 0.1.0, the module allow to manage a simple Proxmox hypervisor right now. @@ -29,7 +34,7 @@ And also directly jump to 0.1.0, the module allow to manage a simple Proxmox hyp ### 0.0.2 - 2015/01/08 -New functionality release, Proxmox installation now working :) +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. diff --git a/README.md b/README.md index 6bc9591..6137ac9 100644 --- a/README.md +++ b/README.md @@ -56,11 +56,20 @@ class { 'proxmox::hypervisor': * `proxmox::hypervisor::group`: Manage groups for Proxmox WebGUI and set permissions. - `proxmox::hypervisor::group { 'sysadmin': role => "Administrator", users => [ 'user1@pam', 'toto@pve' ], }` +``` +proxmox::hypervisor::group { 'sysadmin': + role => "Administrator", + users => [ 'user1@pam', 'toto@pve' ], +} +``` * `proxmox::hypervisor::user`: Manage user for Proxmox WebGUI. - `proxmox::hypervisor::user { 'marvin': group => 'sysadmin', } +``` +proxmox::hypervisor::user { 'marvin': + group => 'sysadmin', +} +``` Mainly used by the `proxmox::hypervisor::group` defined type to create the group, permissions and also create/add the users to a group. Because to add a user to a group via this defined type, the group should already exist. diff --git a/manifests/hypervisor/group.pp b/manifests/hypervisor/group.pp index 7ec550b..2a92fbe 100644 --- a/manifests/hypervisor/group.pp +++ b/manifests/hypervisor/group.pp @@ -29,7 +29,7 @@ # # The user list members of this group. A user will be created if not exist. # -define proxmox::hypervisor::group ( $group = $title, $role, $acl_path = '/', $permission_file = '/etc/pve/user.cfg', $users = '' ) { +define proxmox::hypervisor::group ( $group = $title, $acl_path = '/', $permission_file = '/etc/pve/user.cfg', $users = '', $role ) { File { owner => root, @@ -38,7 +38,7 @@ define proxmox::hypervisor::group ( $group = $title, $role, $acl_path = '/', $pe } Exec { - path => ['/bin','/sbin','/usr/bin','/usr/sbin'], + path => ['/bin','/sbin','/usr/bin','/usr/sbin'], logoutput => 'on_failure', } diff --git a/manifests/hypervisor/user.pp b/manifests/hypervisor/user.pp index 219f4a0..e4529aa 100644 --- a/manifests/hypervisor/user.pp +++ b/manifests/hypervisor/user.pp @@ -22,7 +22,7 @@ define proxmox::hypervisor::user ( $user = $title, $group = '', $permission_file = '/etc/pve/user.cfg' ) { Exec { - path => ['/bin','/sbin','/usr/bin','/usr/sbin'], + path => ['/bin','/sbin','/usr/bin','/usr/sbin'], logoutput => 'on_failure', } diff --git a/tests/group_management.pp b/tests/group_management.pp index ba98470..9cc1b12 100644 --- a/tests/group_management.pp +++ b/tests/group_management.pp @@ -1,2 +1,8 @@ -proxmox::hypervisor::group { 'sysadmin': role => "Administrator", users => [ 'user1@pam', 'toto@pve' ], } -proxmox::hypervisor::group { 'audit': role => "PVEAuditor", users => [ 'user2@pam' ], } +proxmox::hypervisor::group { 'sysadmin': + role => "Administrator", + users => [ 'user1@pam', 'toto@pve' ], +} +proxmox::hypervisor::group { 'audit': + role => "PVEAuditor", + users => [ 'user2@pam' ], +}