From 4dcbf85efeb18713767cbe43885e5a6f236addb7 Mon Sep 17 00:00:00 2001
From: Steve Brasier <33413598+sjpb@users.noreply.github.com>
Date: Fri, 2 Feb 2024 12:28:48 +0000
Subject: [PATCH] Support manila in workstation (#131)

* install ceph client in webconsole role

* add ubuntu-desktop-manila build with azimuth guacamole user

* change default desktop build to connect with azimuth

* add azimuth user to desktop

* remove separate manila build

* fix userdata definition

* bump os-manila-mount to release

* Update to v24.1.1 of os-manila-mount

---------

Co-authored-by: John Garbutt <john.garbutt@stackhpc.com>
---
 ansible/roles/linux-webconsole/defaults/main.yml |  4 ++--
 ansible/roles/linux-webconsole/tasks/main.yml    |  4 ++++
 packer/linux-desktop.pkr.hcl                     | 14 ++++++++++++++
 requirements.yml                                 |  5 +++++
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/linux-webconsole/defaults/main.yml b/ansible/roles/linux-webconsole/defaults/main.yml
index 23e1780..ba63157 100644
--- a/ansible/roles/linux-webconsole/defaults/main.yml
+++ b/ansible/roles/linux-webconsole/defaults/main.yml
@@ -3,5 +3,5 @@
 # By default, the desktop is not enabled
 desktop_enabled: no
 
-# By default, use the connecting user to run the guacamole services
-guacamole_user: "{{ ansible_user }}"
+# By default, use the azimuth user to run the guacamole services
+guacamole_user: azimuth
diff --git a/ansible/roles/linux-webconsole/tasks/main.yml b/ansible/roles/linux-webconsole/tasks/main.yml
index 65fd151..d6e640d 100644
--- a/ansible/roles/linux-webconsole/tasks/main.yml
+++ b/ansible/roles/linux-webconsole/tasks/main.yml
@@ -73,6 +73,10 @@
         owner: ubuntu
         group: ubuntu
 
+- include_role:
+    name: stackhpc.os-manila-mount
+    tasks_from: install.yml
+
 - include_role:
     name: linux-eessi
 
diff --git a/packer/linux-desktop.pkr.hcl b/packer/linux-desktop.pkr.hcl
index b6e4b2d..d828b4f 100644
--- a/packer/linux-desktop.pkr.hcl
+++ b/packer/linux-desktop.pkr.hcl
@@ -67,6 +67,20 @@ source "openstack" "linux-desktop" {
   communicator = "ssh"
   ssh_username = var.ssh_username
   ssh_clear_authorized_keys = true
+
+  user_data = <<-EOF
+  #cloud-config
+  users:
+  - default
+  # create a new default-type user matching Slurm platform:
+  - name: azimuth
+    uid: 1005
+    lock_passwd: true
+    gecos: Azimuth User
+    groups: [adm, systemd-journal]
+    sudo: ["ALL=(ALL) NOPASSWD:ALL"]
+    shell: /bin/bash
+  EOF
 }
 
 build {
diff --git a/requirements.yml b/requirements.yml
index 54dda43..fa25d09 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -14,3 +14,8 @@ collections:
     version: 1.11.0
   - name: prometheus.prometheus
     version: 0.11.2
+
+roles:
+  - src: https://github.com/stackhpc/ansible-role-os-manila-mount.git
+    name: stackhpc.os-manila-mount
+    version: v24.1.1