Make the wm package selectable (#7)

* Make the wm package selectable

* pinning docker api version

* rty

.ansible-lint

@@ -1,4 +1,4 @@
 # use `# noqa xxx` at the end of a line, to ignore a particular error
 # or add to the warn_list, to ignore for the whole project
 warn_list:
-  - internal-error  # Unexpected internal error.
+- internal-error  # Unexpected internal error.

README.md

@@ -20,6 +20,10 @@ See `defaults/main.yml`
 - hosts: servers
   roles:
   - role: marvel-nccr.ubuntu_desktop
+  vars:
+    ubuntu_desktop_vm_user: "{{ vm_user }}"
+    ubuntu_desktop_browser: "{{ vm_browser }}"
+    ubuntu_desktop_wm_package: "{{ vm_wm_package }}" # e.g. lxde, ubuntu-desktop, ubuntu-desktop-minimal
 ```
 
 ## Development and testing

defaults/main.yml

@@ -1,4 +1,5 @@
 ubuntu_desktop_browser: firefox
+ubuntu_desktop_wm_package: ubuntu-desktop
 ubuntu_desktop_vm_user: "{{ ansible_env.SUDO_USER | default(ansible_env.USER, true) | default(ansible_user_id, true) }}"
 
 # yamllint disable-line rule:line-length

requirements.txt

@@ -3,3 +3,4 @@ ansible~=2.10.0
 # for testing
 molecule[docker]~=3.1.0
 docker~=4.2
+requests~=2.24.0

tasks/packages.yml

@@ -1,10 +1,8 @@
-- name: Install ubuntu-desktop (apt)
+- name: Install wm desktop (apt)
   become: true
   apt:
     name:
-    - ubuntu-desktop
-      # - lxde
-      # - lxde-common
+    - "{{ ubuntu_desktop_wm_package }}" # e.g. lxde, ubuntu-desktop-minimal
     - python3-pip
 
 - name: Install packages (pip)