Make libvirtd.conf and qemu.conf configurable

Adds support for configuring libvirtd.conf via
libvirt_host_libvirtd_conf and qemu.conf via libvirt_host_qemu_conf.
This will overwrite any existing configuration in these files.
Configuring these files may be avoided via
libvirt_host_libvirtd_conf_enabled and libvirt_host_qemu_conf_enabled
respectively.

Author: markgoddard

README.md

@@ -103,6 +103,18 @@ daemon. Default is `true`.
 `libvirt_host_install_client`: Whether to install and enable the libvirt
 client. Default is `true`.
 
+`libvirt_host_libvirtd_conf_enabled`: Whether to configure `libvirtd.conf`.
+Default is `true`.
+
+`libvirt_host_libvirtd_conf`: Configuration for `libvirtd.conf`. Dict mapping
+option names to values. Default is an empty dict.
+
+`libvirt_host_qemu_conf_enabled`: Whether to configure `qemu.conf`. Default is
+`true`.
+
+`libvirt_host_qemu_conf`: Configuration for `qemu.conf`. Dict mapping option
+names to values. Default is an empty dict.
+
 Dependencies
 ------------
 

defaults/main.yml

@@ -73,3 +73,13 @@ libvirt_host_install_daemon: true
 
 # Whether to install and enable the libvirt client.
 libvirt_host_install_client: true
+
+# Whether to configure libvirtd.conf.
+libvirt_host_libvirtd_conf_enabled: true
+# Configuration for libvirtd.conf. Dict mapping option names to values.
+libvirt_host_libvirtd_conf: {}
+
+# Whether to configure qemu.conf.
+libvirt_host_qemu_conf_enabled: true
+# Configuration for qemu.conf. Dict mapping option names to values.
+libvirt_host_qemu_conf: {}

tasks/config.yml

@@ -1,16 +1,6 @@
 ---
 # Configure services - runs after the install stage
 
-- name: Set socket directory in libvirtd.conf
-  lineinfile:
-    path: /etc/libvirt/libvirtd.conf
-    insertafter: '^#unix_sock_dir ='
-    regexp: '^unix_sock_dir ='
-    line: unix_sock_dir = "{{ libvirt_host_socket_dir }}"
-  become: true
-  when: libvirt_host_socket_dir | length > 0
-  notify: restart libvirt
-
 - name: Create directory for libvirt socket
   file:
     state: directory
@@ -31,6 +21,28 @@
   notify:
     - restart libvirt
 
+- name: Ensure configuration files exist
+  template:
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
+    owner: root
+    group: root
+    mode: 0644
+  become: true
+  loop: "{{ _libvirt_config_files | selectattr('enabled') }}"
+  loop_control:
+    label: "{{ item.dest | basename }}"
+  vars:
+    _libvirt_config_files:
+      - src: libvirtd.conf.j2
+        dest: /etc/libvirt/libvirtd.conf
+        enabled: "{{ libvirt_host_libvirtd_conf_enabled | bool }}"
+      - src: qemu.conf.j2
+        dest: /etc/libvirt/qemu.conf
+        enabled: "{{ libvirt_host_qemu_conf_enabled | bool }}"
+  notify:
+    - restart libvirt
+
 - name: Flush handlers
   meta: flush_handlers
 

templates/libvirtd.conf.j2

@@ -0,0 +1,8 @@
+# {{ ansible_managed }}
+{% if libvirt_host_socket_dir | length > 0 %}
+unix_sock_dir = "{{ libvirt_host_socket_dir }}"
+{% endif %}
+{% for key, value in libvirt_host_libvirtd_conf.items() %}
+{# While the value is not JSON formatted, it is close enough - strings need to be double quoted. #}
+{{ key }} = {{ value | to_json }}
+{% endfor %}

templates/qemu.conf.j2

@@ -0,0 +1,5 @@
+# {{ ansible_managed }}
+{% for key, value in libvirt_host_qemu_conf.items() %}
+{# While the value is not JSON formatted, it is close enough - strings need to be double quoted. #}
+{{ key }} = {{ value | to_json }}
+{% endfor %}