From fda0955acf0098c5177ad052c46523a76af655a9 Mon Sep 17 00:00:00 2001 From: Manuel Bentele Date: Fri, 25 Jun 2021 14:49:12 +0200 Subject: [mltk-qemu] Add build of 'qemu' mltk target --- libvirt/tasks/main.yml | 37 -------------------------------- looking-glass-client/defaults/main.yml | 5 +++++ looking-glass-client/tasks/main.yml | 29 +++++++++++++++++++++++++ mltk-qemu/meta/main.yml | 3 +++ mltk-qemu/tasks/main.yml | 3 +++ setup-bwlp.yml | 39 ++++++++++++++++++---------------- virt-manager/defaults/main.yml | 3 +++ virt-manager/tasks/main.yml | 6 ++++++ virt-viewer/defaults/main.yml | 3 +++ virt-viewer/tasks/main.yml | 6 ++++++ 10 files changed, 79 insertions(+), 55 deletions(-) delete mode 100644 libvirt/tasks/main.yml create mode 100644 looking-glass-client/defaults/main.yml create mode 100644 looking-glass-client/tasks/main.yml create mode 100644 mltk-qemu/meta/main.yml create mode 100644 mltk-qemu/tasks/main.yml create mode 100644 virt-manager/defaults/main.yml create mode 100644 virt-manager/tasks/main.yml create mode 100644 virt-viewer/defaults/main.yml create mode 100644 virt-viewer/tasks/main.yml diff --git a/libvirt/tasks/main.yml b/libvirt/tasks/main.yml deleted file mode 100644 index 55dbeca..0000000 --- a/libvirt/tasks/main.yml +++ /dev/null @@ -1,37 +0,0 @@ ---- -- name: libvirt | Install packages for libvirt - apt: - name: - - openjdk-8-jre-headless - - libvirt-daemon-system - - libvirt-daemon - - libvirt-clients - - virt-viewer - - dnsmasq - state: present - install_recommends: no - -- name: libvirt | Remove default network configuration - file: - path: "{{ item }}" - state: absent - with_items: - - /etc/libvirt/qemu/networks/default.xml - - /etc/libvirt/qemu/networks/autostart/default.xml - -- name: libvirt | Remove GNOME from accessibility.properties - replace: - path: /etc/java-8-openjdk/accessibility.properties - regexp: '^(assistive_technologies=.*)' - replace: '#\1' - -- name: livirt | Disable systemd services - systemd: - name: "{{ item }}" - enabled: no - with_items: - - libvirtd - - libvirtd.socket - - libvirt-guests - - dnsmasq - ignore_errors: yes diff --git a/looking-glass-client/defaults/main.yml b/looking-glass-client/defaults/main.yml new file mode 100644 index 0000000..16704cf --- /dev/null +++ b/looking-glass-client/defaults/main.yml @@ -0,0 +1,5 @@ +--- +looking_glass_client_packages: + - looking-glass-client +looking_glass_client_package_name: + looking-glass-client diff --git a/looking-glass-client/tasks/main.yml b/looking-glass-client/tasks/main.yml new file mode 100644 index 0000000..0b76104 --- /dev/null +++ b/looking-glass-client/tasks/main.yml @@ -0,0 +1,29 @@ +--- +- name: looking-glass-client | Install packages for looking-glass-client + apt: + name: "{{ looking_glass_client_packages }}" + state: present + install_recommends: no + +- name: looking-glass-client | Gather the apt package facts + package_facts: + manager: apt + +- name: looking-glass-client | Get version information from package facts + set_fact: + looking_glass_client: + versions: "{{ ansible_facts.packages[looking_glass_client_package_name | string] | + map(attribute='version') | + list }}" + cacheable: yes + when: "(looking_glass_client_package_name | string) in ansible_facts.packages" + +- name: looking-glass-client | Print notice to install suitable looking-glass-host version in VM + debug: + msg: "Please install the looking-glass-host in version {{ looking_glass_client.versions[0] }} in the VM!" + when: "looking_glass_client.versions is defined and (looking_glass_client.versions | length) == 1" + +- name: looking-glass-client | Print error message if installation was not successful + fail: + msg: "The looking-glass-client is not installed properly" + when: "looking_glass_client.versions is not defined or (looking_glass_client.versions | length) != 1" diff --git a/mltk-qemu/meta/main.yml b/mltk-qemu/meta/main.yml new file mode 100644 index 0000000..74efe31 --- /dev/null +++ b/mltk-qemu/meta/main.yml @@ -0,0 +1,3 @@ +--- +dependencies: + - { role: mltk-core } diff --git a/mltk-qemu/tasks/main.yml b/mltk-qemu/tasks/main.yml new file mode 100644 index 0000000..4eeb8ff --- /dev/null +++ b/mltk-qemu/tasks/main.yml @@ -0,0 +1,3 @@ +--- +- name: mltk | Build and install qemu target + shell: "{{ mltk_git_target }}/mltk qemu -b -i -d" diff --git a/setup-bwlp.yml b/setup-bwlp.yml index cd07c02..991c6e6 100644 --- a/setup-bwlp.yml +++ b/setup-bwlp.yml @@ -8,21 +8,24 @@ upgrade: dist tags: always roles: - - { role: desktop-common, tags: core } - - { role: desktop-xfce4, tags: core } - - { role: docker-ce, tags: core } - - { role: docker-nvidia, tags: core } - - { role: enable-sysrq, tags: core } - - { role: journald, tags: core } - - { role: libvirt, tags: core } - - { role: singularity, tags: core } - - { role: tools-base, tags: core } - - { role: desktop-kde-plasma, tags: extended } - - { role: desktop-i3, tags: extended } - - { role: desktop-ubuntu, tags: extended } - - { role: tools-extended, tags: extended } - - { role: mltk-bwlp, tags: core } - - { role: mltk-vmware, tags: core } - - { role: mltk-nvidia, tags: core } - - { role: cleanup-apt, tags: core } - - { role: cleanup-systemd, tags: core } \ No newline at end of file + - { role: desktop-common, tags: core } + - { role: desktop-xfce4, tags: core } + - { role: docker-ce, tags: core } + - { role: docker-nvidia, tags: core } + - { role: enable-sysrq, tags: core } + - { role: journald, tags: core } + - { role: singularity, tags: core } + - { role: tools-base, tags: core } + - { role: virt-viewer, tags: extended } + - { role: virt-manager, tags: extended } + - { role: looking-glass-client, tags: extended } + - { role: desktop-kde-plasma, tags: extended } + - { role: desktop-i3, tags: extended } + - { role: desktop-ubuntu, tags: extended } + - { role: tools-extended, tags: extended } + - { role: mltk-bwlp, tags: core } + - { role: mltk-vmware, tags: core } + - { role: mltk-qemu, tags: core } + - { role: mltk-nvidia, tags: core } + - { role: cleanup-apt, tags: core } + - { role: cleanup-systemd, tags: core } diff --git a/virt-manager/defaults/main.yml b/virt-manager/defaults/main.yml new file mode 100644 index 0000000..a4a9460 --- /dev/null +++ b/virt-manager/defaults/main.yml @@ -0,0 +1,3 @@ +--- +virt_manager_packages: + - virt-manager diff --git a/virt-manager/tasks/main.yml b/virt-manager/tasks/main.yml new file mode 100644 index 0000000..f392274 --- /dev/null +++ b/virt-manager/tasks/main.yml @@ -0,0 +1,6 @@ +--- +- name: virt-manager | Install packages for virt-manager + apt: + name: "{{ virt_manager_packages }}" + state: present + install_recommends: no diff --git a/virt-viewer/defaults/main.yml b/virt-viewer/defaults/main.yml new file mode 100644 index 0000000..1c44ca6 --- /dev/null +++ b/virt-viewer/defaults/main.yml @@ -0,0 +1,3 @@ +--- +virt_viewer_packages: + - virt-viewer diff --git a/virt-viewer/tasks/main.yml b/virt-viewer/tasks/main.yml new file mode 100644 index 0000000..01e206e --- /dev/null +++ b/virt-viewer/tasks/main.yml @@ -0,0 +1,6 @@ +--- +- name: virt-viewer | Install packages for virt-viewer + apt: + name: "{{ virt_viewer_packages }}" + state: present + install_recommends: no -- cgit v1.2.3-55-g7522