From fd062479ae40e7b1079e514e8fbd124a297b4dc6 Mon Sep 17 00:00:00 2001
From: Varac <varac@varac.net>
Date: Thu, 7 Mar 2019 13:41:12 +0100
Subject: [PATCH] Define rke_configuration vars in defaults/main.yml
---
ansible/roles/rke_configuration/defaults/main.yml | 6 +++---
ansible/roles/rke_configuration/tasks/main.yml | 4 ----
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/ansible/roles/rke_configuration/defaults/main.yml b/ansible/roles/rke_configuration/defaults/main.yml
index 5a325ccb9..faae1a95c 100644
--- a/ansible/roles/rke_configuration/defaults/main.yml
+++ b/ansible/roles/rke_configuration/defaults/main.yml
@@ -1,3 +1,3 @@
-rke_configuration_location: "cluster.yml"
-# rke_ssh_key_path: ""
-rke_ssh_agent_auth: "true"
+rke_configuration_location: "/oas/control/local/rke/cluster.yml"
+rke_ssh_key_path: "/oas/config/ssh_key"
+rke_ssh_agent_auth: "false"
diff --git a/ansible/roles/rke_configuration/tasks/main.yml b/ansible/roles/rke_configuration/tasks/main.yml
index bf534c322..79e7094f0 100644
--- a/ansible/roles/rke_configuration/tasks/main.yml
+++ b/ansible/roles/rke_configuration/tasks/main.yml
@@ -13,10 +13,6 @@
become: true
- name: Copy rke cluster configuration file
- vars:
- rke_configuration_location: "/oas/control/local/rke/cluster.yml"
- rke_ssh_key_path: "/oas/config/ssh_key"
- rke_ssh_agent_auth: "false"
template:
src: "cluster.yml.j2"
dest: "{{ rke_configuration_location }}"
--
GitLab