From c090781bd532c035dfbb61e51a776bd4cee6f8f9 Mon Sep 17 00:00:00 2001 From: jacob Date: Wed, 27 Sep 2023 11:43:39 -0500 Subject: [PATCH] Roll back and var changes --- roles/rke2_agent/tasks/main.yml | 2 +- roles/rke2_common/tasks/add-registry-config.yml | 4 ++-- roles/rke2_server/tasks/main.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/rke2_agent/tasks/main.yml b/roles/rke2_agent/tasks/main.yml index 1cdbe83d..07654f83 100644 --- a/roles/rke2_agent/tasks/main.yml +++ b/roles/rke2_agent/tasks/main.yml @@ -2,7 +2,7 @@ - name: RKE2 agent and server tasks vars: - rke2_common_name: agent + caller_role_name: agent ansible.builtin.include_role: name: rke2_common tasks_from: main diff --git a/roles/rke2_common/tasks/add-registry-config.yml b/roles/rke2_common/tasks/add-registry-config.yml index 26fd9284..9af0add6 100644 --- a/roles/rke2_common/tasks/add-registry-config.yml +++ b/roles/rke2_common/tasks/add-registry-config.yml @@ -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 @@ -22,5 +22,5 @@ mode: '0640' owner: root group: root - when: rke2_common_name == "agent" + when: caller_role_name == "agent" notify: Restart rke2-agent diff --git a/roles/rke2_server/tasks/main.yml b/roles/rke2_server/tasks/main.yml index 64afc81b..fb7f4111 100644 --- a/roles/rke2_server/tasks/main.yml +++ b/roles/rke2_server/tasks/main.yml @@ -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