From 19b9a2458e8838eaf96873c759ff8d67d0f4575f Mon Sep 17 00:00:00 2001
From: Jacob Cody Wimer <jacob.wimer@gmail.com>
Date: Thu, 25 Apr 2019 13:21:27 -0400
Subject: [PATCH] Added variables for rke stuff

---
 group_vars/all                                |  2 ++
 roles/kubernetes/tasks/main.yml               | 28 +++++++++----------
 ...yaml.j2 => rke-cluster-deployment.yaml.j2} |  2 +-
 3 files changed, 17 insertions(+), 15 deletions(-)
 rename roles/kubernetes/templates/{rke-cluster.yaml.j2 => rke-cluster-deployment.yaml.j2} (97%)

diff --git a/group_vars/all b/group_vars/all
index bea9f36..b40f027 100644
--- a/group_vars/all
+++ b/group_vars/all
@@ -33,7 +33,9 @@ vip_address: 10.0.0.200
 
 # rke
 rke_directory: /root/rke
+rke_node_directory: /rke
 rke_version: 0.2.1
+rke_cluster_name: rke-k8s
 rke_ssh_key_location: /root/id_home
 rke_nfs_path: "{{ nfs_share }}/raw-files/fileserver/shares/lab-data/kubernetes"
 alertmanager_email_password: "{{ lookup('env', 'GMAIL_SERVICE_PASSWORD') }}"
diff --git a/roles/kubernetes/tasks/main.yml b/roles/kubernetes/tasks/main.yml
index 08c6ccf..a9bc367 100644
--- a/roles/kubernetes/tasks/main.yml
+++ b/roles/kubernetes/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: Creates RKE directory on nodes
   file:
-    path: /rke
+    path: "{{ rke_node_directory }}"
     state: directory
 
 - name: Create RKE directory
@@ -13,24 +13,24 @@
 
 - name: Check if RKE cluster state file exists
   stat:
-    path: /rke/rke-cluster.rkestate
+    path: "{{ rke_node_directory }}/{{ rke_cluster_name }}.rkestate"
   register: cluster_state_result
 
 - name: Check if RKE kubeconfig file exists
   stat:
-    path: /rke/kube_config_rke-cluster.yaml
+    path: "{{ rke_node_directory }}/kube_config_{{ rke_cluster_name }}.yaml"
   register: kube_config_result
 
 - name: Copy RKE cluster state back to local if it already exists 
   fetch: 
-    src: /rke/rke-cluster.rkestate
-    dest: /local
+    src: "{{ rke_node_directory }}/{{ rke_cluster_name }}.rkestate"
+    dest: "{{ rke_directory }}/{{ rke_cluster_name }}.rkestate"
   when: cluster_state_result.stat.exists == True 
 
 - name: Copy RKE kube config if it already exists
   fetch: 
-    src: /rke/kube_config_rke-cluster.yaml
-    dest: "{{ rke_directory }}/kube_config_rke-cluster.yaml"
+    src: "{{ rke_node_directory }}/kube_config_{{ rke_cluster_name }}.yaml"
+    dest: "{{ rke_directory }}/kube_config_{{ rke_cluster_name }}.yaml"
   when: kube_config_result.stat.exists == True 
 
 - name: Create RKE Configs directory
@@ -56,8 +56,8 @@
 
 - name: Put RKE cluster config in place
   template:
-    src: ../templates/rke-cluster.yaml.j2
-    dest: "{{ rke_directory }}/rke-cluster.yaml"
+    src: ../templates/rke-cluster-deployment.yaml.j2
+    dest: "{{ rke_directory }}/rke-cluster-deployment.yaml"
   delegate_to: localhost
   run_once: true
 
@@ -87,16 +87,16 @@
 
 - name: Run RKE
   shell: >
-    bash -c "{{ rke_directory }}/rke up --config {{ rke_directory }}/rke-cluster.yaml"
+    bash -c "{{ rke_directory }}/rke up --config {{ rke_directory }}/rke-cluster-deployment.yaml"
   delegate_to: localhost
   run_once: true
 
 - name: Copy RKE kube config back to nodes after RKE run
   copy:
-    src: "{{ rke_directory }}/kube_config_rke-cluster.yaml"
-    dest: /rke/kube_config_rke-cluster.yaml
+    src: "{{ rke_directory }}/kube_config_{{ rke_cluster_name }}.yaml"
+    dest: "{{ rke_node_directory }}/kube_config_{{ rke_cluster_name }}.yaml"
 
 - name: Copy RKE cluster state back to nodes after RKE run
   copy:
-    src: "{{ rke_directory }}/rke-cluster.rkestate"
-    dest: /rke/rke-cluster.rkestate
\ No newline at end of file
+    src: "{{ rke_directory }}/{{ rke_cluster_name }}.rkestate"
+    dest: "{{ rke_node_directory }}/{{ rke_cluster_name }}.rkestate"
\ No newline at end of file
diff --git a/roles/kubernetes/templates/rke-cluster.yaml.j2 b/roles/kubernetes/templates/rke-cluster-deployment.yaml.j2
similarity index 97%
rename from roles/kubernetes/templates/rke-cluster.yaml.j2
rename to roles/kubernetes/templates/rke-cluster-deployment.yaml.j2
index c750977..1639068 100644
--- a/roles/kubernetes/templates/rke-cluster.yaml.j2
+++ b/roles/kubernetes/templates/rke-cluster-deployment.yaml.j2
@@ -2,7 +2,7 @@
 
 ssh_key_path: {{ rke_ssh_key_location }}
 
-cluster_name: rke-k8s
+cluster_name: rke_cluster_name
 ignore_docker_version: true
 kubernetes_version: v1.13.4-rancher1-2
 system_images: