summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThedro Neely <thedroneely@gmail.com>2020-03-24 15:01:20 -0400
committerThedro Neely <thedroneely@gmail.com>2020-03-24 15:01:20 -0400
commit152ef33462c3ad0d62c04030339738af1725b41b (patch)
treebfb8f1c8fc73f04a743fe41c70602d9915837d3a
parent1db40cdf9cb25b446ffd15dfd1e3e6f178ae2257 (diff)
downloadplaybooks-152ef33462c3ad0d62c04030339738af1725b41b.tar.gz
playbooks-152ef33462c3ad0d62c04030339738af1725b41b.tar.bz2
playbooks-152ef33462c3ad0d62c04030339738af1725b41b.zip
roles/k8s/main: Move variables
-rw-r--r--roles/k8s/main.yml2
-rw-r--r--roles/k8s/variables.yml3
-rw-r--r--roles/variables.yml4
3 files changed, 5 insertions, 4 deletions
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