Skip to content

Commit d2b9f71

Browse files
committed
try to fix login state dir
1 parent 8a88e38 commit d2b9f71

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

group_vars/grafana.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,3 @@ grafana_serve_from_sub_path: "{{ 'openondemand' in groups }}"
55
grafana_auth_anonymous: "{{ 'openondemand' in groups }}"
66

77
grafana_url: "{{ grafana_url_openondemand_proxy if 'openondemand' in groups else grafana_url_direct }}"
8-
9-
state_dir_mnt_opts: "x-systemd.required-by=zenith-monitoring.service,x-systemd.before=zenith-monitoring.service"

group_vars/nfs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ nfs_configurations:
88
clients: "{{ inventory_hostname in groups['cluster'] and inventory_hostname not in groups['control'] }}"
99
nfs_export: "/exports/home" # assumes skeleton TF is being used
1010
nfs_client_mnt_point: "/home"
11-
- comment: Export /var/lib/state from Slurm control node to login
11+
- comment: Export /var/lib/state from Slurm control node to OOD
1212
nfs_enable:
1313
server: "{{ inventory_hostname in groups['control'] }}"
14-
clients: "{{ inventory_hostname in groups['login'] }}"
14+
clients: "{{ inventory_hostname in groups['openondemand'] }}"
1515
nfs_export: "{{ appliances_state_dir }}"
1616
nfs_client_mnt_point: "{{ appliances_state_dir }}"
17-
nfs_client_mnt_options: "{{ state_dir_mnt_opts }}"
17+
nfs_client_mnt_options: "x-systemd.required-by=zenith-ood.service,x-systemd.before=zenith-ood.service"

group_vars/openondemand.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,3 @@ _opeonondemand_unset_auth: ' RequestHeader unset Authorization'
7474

7575
# Fix grafana proxying for basic auth if anonymous grafana access enabled:
7676
openondemand_node_proxy_directives: "{{ _opeonondemand_unset_auth if (openondemand_auth == 'basic_pam' and 'openondemand_host_regex' and 'grafana' in groups and hostvars[groups['grafana'][0]]._grafana_auth_is_anonymous) else '' }}"
77-
78-
state_dir_mnt_opts: "x-systemd.required-by=zenith-ood.service,x-systemd.before=zenith-ood.service"

0 commit comments

Comments
 (0)