Skip to content

Commit 8f2759f

Browse files
committed
Use include_role in enter/exit maintenance
import_role can result in confusing variable shadowing issues.
1 parent 62f4b6d commit 8f2759f

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

roles/enter_maintenance/tasks/enter.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
- name: Check if host can enter maintenance mode
3-
ansible.builtin.import_role:
3+
ansible.builtin.include_role:
44
name: stackhpc.cephadm.commands
55
vars:
66
cephadm_commands:
@@ -18,15 +18,15 @@
1818
fail_msg: "{{ cephadm_commands_result.results[0].stderr }}"
1919

2020
- name: Fail over Ceph manager
21-
ansible.builtin.import_role:
21+
ansible.builtin.include_role:
2222
name: stackhpc.cephadm.commands
2323
vars:
2424
cephadm_commands:
2525
- "mgr fail"
2626
when: '"Cannot stop active Mgr daemon" in cephadm_commands_result.results[0].stderr'
2727

2828
- name: Ensure host is in maintenance mode
29-
ansible.builtin.import_role:
29+
ansible.builtin.include_role:
3030
name: stackhpc.cephadm.commands
3131
vars:
3232
cephadm_commands:

roles/enter_maintenance/tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
whether it is safe to stop them.
99
1010
- name: List hosts in maintenance
11-
ansible.builtin.import_role:
11+
ansible.builtin.include_role:
1212
name: stackhpc.cephadm.commands
1313
vars:
1414
cephadm_commands:

roles/exit_maintenance/tasks/exit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
- name: Ensure host has exited maintenance mode
3-
ansible.builtin.import_role:
3+
ansible.builtin.include_role:
44
name: stackhpc.cephadm.commands
55
vars:
66
cephadm_commands:

roles/exit_maintenance/tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Hosts must be removed from maintenance one at a time.
88
99
- name: List hosts
10-
ansible.builtin.import_role:
10+
ansible.builtin.include_role:
1111
name: stackhpc.cephadm.commands
1212
vars:
1313
cephadm_commands:

0 commit comments

Comments
 (0)