From 152ef33462c3ad0d62c04030339738af1725b41b Mon Sep 17 00:00:00 2001 From: Thedro Neely Date: Tue, 24 Mar 2020 15:01:20 -0400 Subject: roles/k8s/main: Move variables --- roles/k8s/main.yml | 2 +- roles/k8s/variables.yml | 3 --- roles/variables.yml | 4 ++++ 3 files changed, 5 insertions(+), 4 deletions(-) delete mode 100644 roles/k8s/variables.yml diff --git a/roles/k8s/main.yml b/roles/k8s/main.yml index fcc22d8..b53d7c4 100644 --- a/roles/k8s/main.yml +++ b/roles/k8s/main.yml @@ -3,7 +3,7 @@ hosts: k8s_master, k8s_node vars_files: - - variables.yml + - ../variables.yml tasks: diff --git a/roles/k8s/variables.yml b/roles/k8s/variables.yml deleted file mode 100644 index 40f793d..0000000 --- a/roles/k8s/variables.yml +++ /dev/null @@ -1,3 +0,0 @@ -k8s_username: k8s -k8s_home: "/home/{{ k8s_username }}" -k8s_version: 1.17.0 diff --git a/roles/variables.yml b/roles/variables.yml index e5f457a..d874b79 100644 --- a/roles/variables.yml +++ b/roles/variables.yml @@ -29,3 +29,7 @@ mkdocs_user: mkdocs mkdocs_home: "/opt/{{ mkdocs_user }}" mkdocs_version: 2505a907f4ef6cc4492031faef06192f9eddf0bc mkdocs_material_version: 4.6.3 + +k8s_username: k8s +k8s_home: "/home/{{ k8s_username }}" +k8s_version: 1.17.0 -- cgit v1.2.3