Merge pull request #76 from lae/feature/vagrant

Add multi-machine Vagrantfile/playbook [ci skip]

Author: lae

.gitignore

@@ -6,3 +6,6 @@
 *.retry
 /.project
 /.pydevproject
+
+fetch/
+.vagrant/

Vagrantfile

@@ -0,0 +1,23 @@
+Vagrant.configure("2") do |config|
+  config.vm.box = "debian/buster64"
+
+  config.vm.provider :libvirt do |libvirt|
+    libvirt.memory = 2048
+    libvirt.cpus = 2
+  end
+
+  N = 3
+  (1..N).each do |machine_id|
+    config.vm.define "pve-#{machine_id}" do |machine|
+      machine.vm.hostname = "pve-#{machine_id}"
+
+      if machine_id == N
+        machine.vm.provision :ansible do |ansible|
+          ansible.limit = "all"
+          ansible.playbook = "tests/vagrant/provision.yml"
+          ansible.verbose = true
+        end
+      end
+    end
+  end
+end

library/collect_kernel_info.py

@@ -4,6 +4,7 @@
 import subprocess
 
 from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils._text import to_text
 
 def main():
     module = AnsibleModule(
@@ -51,17 +52,17 @@ def main():
 
     # This will likely output a path that considers the boot partition as /
     # e.g. /vmlinuz-4.4.44-1-pve
-    booted_kernel = subprocess.check_output(["grep", "-o", "-P", "(?<=BOOT_IMAGE=).*?(?= )", "/proc/cmdline"]).strip()
+    booted_kernel = to_text(subprocess.check_output(["grep", "-o", "-P", "(?<=BOOT_IMAGE=).*?(?= )", "/proc/cmdline"]).strip())
 
     booted_kernel_package = ""
     old_kernel_packages = []
 
     if params['lookup_packages']:
         for kernel in kernels:
             if kernel.split("/")[-1] == booted_kernel.split("/")[-1]:
-                booted_kernel_package = subprocess.check_output(["dpkg-query", "-S", kernel]).split(":")[0]
+                booted_kernel_package = to_text(subprocess.check_output(["dpkg-query", "-S", kernel])).split(":")[0]
             elif kernel != latest_kernel:
-                old_kernel_packages.append(subprocess.check_output(["dpkg-query", "-S", kernel]).split(":")[0])
+                old_kernel_packages.append(to_text(subprocess.check_output(["dpkg-query", "-S", kernel])).split(":")[0])
 
     # returns True if we're not booted into the latest kernel
     new_kernel_exists = booted_kernel.split("/")[-1] != latest_kernel.split("/")[-1]

module_utils/pvesh.py

@@ -4,6 +4,8 @@
 import json
 import re
 
+from ansible.module_utils._text import to_text
+
 class ProxmoxShellError(Exception):
     """Exception raised when an unexpected response code is thrown from pvesh."""
     def __init__(self, response):
@@ -23,12 +25,13 @@ def run_command(handler, resource, **params):
         handler,
         resource,
         "--output=json"]
-    for parameter, value in params.iteritems():
+    for parameter, value in params.items():
         command += ["-{}".format(parameter), "{}".format(value)]
 
     pipe = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     (result, stderr) = pipe.communicate()
-    stderr = stderr.splitlines()
+    result = to_text(result)
+    stderr = to_text(stderr).splitlines()
 
     if len(stderr) == 0:
         if not result:

tests/vagrant/group_vars/all

@@ -0,0 +1,29 @@
+---
+ansible_python_interpreter: /usr/bin/python3
+
+pve_group: all
+pve_extra_packages:
+  - sl
+pve_check_for_kernel_update: true
+pve_reboot_on_kernel_update: true
+pve_run_system_upgrades: true
+pve_zfs_enabled: yes
+pve_zfs_zed_email: root@localhost
+pve_cluster_enabled: yes
+pve_datacenter_cfg:
+  console: xtermjs
+pve_groups:
+  - name: Admins
+    comment: Administrators of this PVE cluster
+pve_users:
+  - name: root@pam
+    email: [email protected]
+pve_acls:
+  - path: /
+    roles: [ "Administrator" ]
+    groups: [ "Admins" ]
+ntp_manage_config: true
+ntp_servers:
+  - clock.sjc.he.net
+  - clock.fmt.he.net
+  - clock.nyc.he.net

tests/vagrant/provision.yml

@@ -0,0 +1,26 @@
+- hosts: all
+  vars:
+    role_name: lae.proxmox
+  tasks:
+    - block:
+      - shell: pwd
+      - name: Package up current working role
+        shell: "cd $(git rev-parse --show-toplevel); git ls-files -z | xargs -0 tar -czvf $OLDPWD/{{ role_name }}.tar.gz"
+      - name: Install packaged role
+        shell: "ansible-galaxy install {{ role_name }}.tar.gz,devel-$(git rev-parse HEAD),{{ role_name }} --force"
+      - name: Remove packaged role artifact
+        file:
+          dest: "{{ role_name }}.tar.gz"
+          state: absent
+      delegate_to: localhost
+      run_once: True
+
+- hosts: all
+  become: True
+  pre_tasks:
+    - name: Install gnupg2
+      apt:
+        name: gnupg2
+  roles:
+    - geerlingguy.ntp
+    - lae.proxmox