Merge pull request #11 from jovial/ubuntu

Support Debian based GNU/Linux distributions

Author: jovial

files/virt_volume.sh

@@ -59,12 +59,17 @@ if [[ $result -ne 0 ]]; then
     exit $result
 fi
 
-# Change the ownership of the volume to qemu. Without doing this libvirt cannot
-# access the volume.
-output=$(chown qemu:qemu $output 2>1)
+# Change the ownership of the volume to VOLUME_OWNER:VOLUME_GROUP if
+# these environmental variables are defined. Without doing this libvirt
+# cannot access the volume on RedHat based GNU/Linux distributions.
+existing_owner="$(stat --format '%U' "$output")"
+existing_group="$(stat --format '%G' "$output")"
+new_owner="${VOLUME_OWNER:-$existing_owner}"
+new_group="${VOLUME_GROUP:-$existing_group}"
+output=$(chown "$new_owner":"$new_group" $output 2>1)
 result=$?
 if [[ $result -ne 0 ]]; then
-    echo "Failed to change ownership of the volume to qemu"
+    echo "Failed to change ownership of the volume to $new_owner:$new_group"
     echo "$output"
     virsh vol-delete --pool $POOL --vol $NAME
     exit $result

meta/main.yml

@@ -11,6 +11,12 @@ galaxy_info:
     - name: EL
       versions:
         - 7
+    - name: Ubuntu
+      versions:
+        - all
+    - name: Debian
+      versions:
+        - all
   galaxy_tags:
     - cloud
     - kvm

tasks/vm.yml

@@ -1,10 +1,20 @@
 ---
+- name: Gather os specific variables
+  include_vars: "{{ item }}"
+  with_first_found:
+    - files:
+        - "{{ ansible_distribution }}-{{ ansible_distribution_major_version}}.yml"
+        - "{{ ansible_distribution }}.yml"
+        - "{{ ansible_os_family }}.yml"
+      skip: true
+  tags: vars
+
 - name: Ensure the VM console log directory exists
   file:
     path: "{{ console_log_path | dirname }}"
     state: directory
-    owner: qemu
-    group: qemu
+    owner: "{{ libvirt_vm_log_owner }}"
+    group: "{{ libvirt_vm_log_owner }}"
     recurse: true
     mode: 0770
   when: console_log_enabled | bool

tasks/volumes.yml

@@ -1,4 +1,13 @@
 ---
+- name: Gather os specific variables
+  include_vars: "{{ item }}"
+  with_first_found:
+    - files:
+        - "{{ ansible_distribution }}-{{ ansible_distribution_major_version}}.yml"
+        - "{{ ansible_distribution }}.yml"
+        - "{{ ansible_os_family }}.yml"
+  tags: vars
+
 - name: Ensure remote images are downloaded
   get_url:
     url: "{{ item }}"
@@ -24,6 +33,7 @@
     {{ libvirt_vm_image_cache_path }}/{{ item.image | basename }}
     {% endif %}
   with_items: "{{ volumes }}"
+  environment: "{{ libvirt_vm_volume_creation_env }}"
   register: volume_result
   changed_when:
     - volume_result is success

vars/Debian.yml

@@ -0,0 +1,7 @@
+---
+
+# Who owns the serial console logs in console_log_path
+libvirt_vm_log_owner: libvirt-qemu
+
+# The environment passed to virt_volume.sh
+libvirt_vm_volume_creation_env: {}

vars/RedHat.yml

@@ -0,0 +1,9 @@
+---
+
+# Who owns the serial console logs in console_log_path
+libvirt_vm_log_owner: qemu
+
+# The environment passed to virt_volume.sh
+libvirt_vm_volume_creation_env:
+  VOLUME_GROUP: qemu
+  VOLUME_OWNER: qemu