Skip to content

Commit

Permalink
Support manila in workstation (#131)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>
  • Loading branch information
sjpb and JohnGarbutt authored Feb 2, 2024
1 parent 78f7e91 commit 4dcbf85
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 2 deletions.
4 changes: 2 additions & 2 deletions ansible/roles/linux-webconsole/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 4 additions & 0 deletions ansible/roles/linux-webconsole/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@
owner: ubuntu
group: ubuntu

- include_role:
name: stackhpc.os-manila-mount
tasks_from: install.yml

- include_role:
name: linux-eessi

Expand Down
14 changes: 14 additions & 0 deletions packer/linux-desktop.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 5 additions & 0 deletions requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 4dcbf85

Please sign in to comment.