Skip to content

Commit 0d3e0d8

Browse files
committed
change appliances_task_mode: runtime -> configure
1 parent f3357db commit 0d3e0d8

File tree

10 files changed

+11
-9
lines changed

10 files changed

+11
-9
lines changed

ansible/filesystems.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030
manila_task_modes:
3131
main:
3232
- main
33-
runtime: # TODO: add a runtime.yml to this role
33+
configure: # TODO: add a configure.yml to this role
3434
- lookup
3535
- mount
36-
#install:
37-
# - install

ansible/monitoring.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
tasks:
5656
- include_role:
5757
name: slurm_exporter
58-
when: "appliances_task_mode != 'runtime'" # install starts it anyway
58+
when: "appliances_task_mode != 'configure'" # install starts it anyway
5959

6060
- name: Setup core monitoring software
6161
hosts: prometheus

ansible/roles/eessi/tasks/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
- name: Include install tasks
22
ansible.builtin.include_tasks: install.yml
33
- name: Include runtime tasks
4-
ansible.builtin.include_tasks: runtime.yml
4+
ansible.builtin.include_tasks: configure.yml

ansible/roles/mysql/tasks/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
- import_tasks: install.yml
2-
- import_tasks: runtime.yml
2+
- import_tasks: configure.yml

ansible/slurm.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@
2828
tasks:
2929
- include_role:
3030
name: stackhpc.openhpc
31-
tasks_from: "{{ appliances_task_mode }}.yml"
31+
tasks_from: "{{ _openhpc_task_mode[appliances_task_mode] }}.yml"
32+
vars:
33+
_openhpc_task_mode:
34+
install: install
35+
configure: runtime
3236

3337
- name: Set locked memory limits on user-facing nodes
3438
hosts:
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
appliances_task_mode: runtime
1+
appliances_task_mode: configure

environments/common/inventory/group_vars/all/defaults.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ appliances_repository_root: "{{ lookup('env', 'APPLIANCES_REPO_ROOT') }}"
55
appliances_environment_root: "{{ lookup('env', 'APPLIANCES_ENVIRONMENT_ROOT') }}"
66
appliances_environment_name: "{{ appliances_environment_root | basename | regex_replace('\\W+', '') }}" # [a-zA-Z0-9_] only
77
#appliances_state_dir: # define an absolute path here to use for persistent state: NB: This is defined as /var/lib/state in inventory by the default Terraform
8-
appliances_task_mode: main # main, install, runtime
8+
appliances_task_mode: main # which taskfiles to run from roles (when supported): main, configure
99

1010
# Address(ip/dns) for internal communication between services. This is
1111
# normally traffic you do no want to expose to users.

0 commit comments

Comments
 (0)