grains should be fixed meow.

Author: Fiona

.vscode/settings.json

@@ -1,3 +1,4 @@
 {
-  "python.pythonPath": "/usr/bin/python3"
+  "python.pythonPath": "C:\\Python27\\python.exe",
+  "python.linting.pylintEnabled": false
 }

_grains/k8sgrain.py

@@ -1,18 +1,13 @@
 import socket
+# define hostname
 hostname = socket.gethostname()
-if 'k8s' in hostname:
-  def k8s_grain():
-    grains = {}
-    grains[role] = 'master'
-    if '01' in hostname:
-      role = 'master'
-    else:
-      role = 'worker'
-    k8s = {'role': role, 'cluster': 'k8spi'}
-    return k8s
-  print(k8s)
-
-else:
-  print("Not a k8s node, no cluster for you")
-
 
+# If hostname contains "k8s" assign the role "master" for 01, else "worker".
+def get_k8s_name():
+    k8s_role_dict = {'k8s role': ''}
+    if 'k8s' in hostname:
+        if '01' in hostname:
+            k8s_role_dict['k8s role'] = 'master'
+        else:
+            k8s_role_dict['k8s role'] = 'worker'
+        return k8s_role_dict

consul/files/config.json

@@ -5,5 +5,6 @@
   "data_dir": "/opt/consul",
   "bind_addr": "192.168.2.13",
   "client_addr": "192.168.2.13",
-  "ui": true
+  "ui": true,
+  "raft_protocol": "3"
 }

consul/init.sls

@@ -54,6 +54,11 @@ consul:
 
 copy consul config:
   file.managed:
-    - name:  
-    - source: salt://{{slspath}}/files/consul.service
-    - mode: 644
+    - name:  /etc/consul.d/config.json
+    - source: salt://{{slspath}}/files/config.json
+    - mode: 644
+    - makedirs: True
+    - user: consul
+    - group: consul
+    - require:
+      - user: consul user