Skip to content

Commit

Permalink
Roll back and var changes
Browse files Browse the repository at this point in the history
  • Loading branch information
jacob committed Sep 27, 2023
1 parent eed170b commit c090781
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion roles/rke2_agent/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

- name: RKE2 agent and server tasks
vars:
rke2_common_name: agent
caller_role_name: agent

Check failure on line 5 in roles/rke2_agent/tasks/main.yml

View workflow job for this annotation

GitHub Actions / Lint for push

var-naming[no-role-prefix]

Variables names from within roles should use rke2_common_ as a prefix. (vars: caller_role_name)

Check failure on line 5 in roles/rke2_agent/tasks/main.yml

View workflow job for this annotation

GitHub Actions / Lint

var-naming[no-role-prefix]

Variables names from within roles should use rke2_common_ as a prefix. (vars: caller_role_name)

Check failure on line 5 in roles/rke2_agent/tasks/main.yml

View workflow job for this annotation

GitHub Actions / Lint

var-naming[no-role-prefix]

Variables names from within roles should use rke2_common_ as a prefix. (vars: caller_role_name)
ansible.builtin.include_role:
name: rke2_common
tasks_from: main
Expand Down
4 changes: 2 additions & 2 deletions roles/rke2_common/tasks/add-registry-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
mode: '0640'
owner: root
group: root
when: rke2_common_name == "server"
when: caller_role_name == "server"
notify: Restart rke2-server

- name: Add registry configuration file
Expand All @@ -22,5 +22,5 @@
mode: '0640'
owner: root
group: root
when: rke2_common_name == "agent"
when: caller_role_name == "agent"
notify: Restart rke2-agent
2 changes: 1 addition & 1 deletion roles/rke2_server/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

- name: RKE2 agent and server tasks
vars:
rke2_common_name: server
caller_role_name: server
ansible.builtin.include_role:
name: rke2_common
tasks_from: main
Expand Down

0 comments on commit c090781

Please sign in to comment.