From 286c713b56da50be95d14c9b42d2437976595b4e Mon Sep 17 00:00:00 2001
From: do <do@maketank.net>
Date: Mon, 21 Sep 2020 11:41:26 +0200
Subject: [PATCH] refatoring of k8s and no more gluster

---
 base/init.sls                              |  2 +-
 hardware/raspberrypi/fan/files/fan_ctrl.py |  4 ++--
 k8s/docker.sls                             | 16 ++++++++++++++++
 k8s/init.sls                               | 10 +---------
 top.sls                                    |  1 +
 5 files changed, 21 insertions(+), 12 deletions(-)
 create mode 100644 k8s/docker.sls

diff --git a/base/init.sls b/base/init.sls
index 1faa0c1..c8c7d50 100644
--- a/base/init.sls
+++ b/base/init.sls
@@ -5,7 +5,7 @@
 include:
   - .packages
   - .pki
-  - .gluster.client
+  #- .gluster.client
   - sysctl
   - rsyslog
   - sudoers
diff --git a/hardware/raspberrypi/fan/files/fan_ctrl.py b/hardware/raspberrypi/fan/files/fan_ctrl.py
index 864934a..be2b1e9 100644
--- a/hardware/raspberrypi/fan/files/fan_ctrl.py
+++ b/hardware/raspberrypi/fan/files/fan_ctrl.py
@@ -10,7 +10,7 @@ import sys
 
 # Configuration
 FAN_PIN = getenv('RPI_FAN_PIN', 21)  # BCM pin used to drive transistor's base
-WAIT_TIME = getenv('RPI_FAN_WAITTIME', 5)  # [s] Time to wait between each refresh
+WAIT_TIME = getenv('RPI_FAN_WAITTIME', 10)  # [s] Time to wait between each refresh
 FAN_MIN = getenv('RPI_FAN_MIN', 80)  # [%] Fan minimum speed.
 PWM_FREQ = getenv('RPI_FAN_PWMFREQ', 25000)  # [Hz] Change this value if fan has strange behavior
 # Fan speed will change only of the difference of temperature is higher than hysteresis
@@ -21,7 +21,7 @@ prom_collect_dir = getenv('RPI_PROM_COLLECTDIR','/tmp/textfile-collector')
 prom_collect_file = prom_collect_dir + '/rpi_fan.prom'
 
 # Configurable temperature and fan speed steps
-tempSteps = [60, 66, 70, 75]  # [°C]
+tempSteps = [60, 70, 75, 80]  # [°C]
 speedSteps = [0, 80, 90, 100]  # [%]
 # tempSteps = [40, 45]
 # speedSteps = [0, 100]
diff --git a/k8s/docker.sls b/k8s/docker.sls
new file mode 100644
index 0000000..513c1c5
--- /dev/null
+++ b/k8s/docker.sls
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+---
+
+docker_pkgs:
+  pkg.installed:
+    - pkgs:
+      - docker.io
+ 
+
+/etc/docker/daemon.json:
+  file.managed:
+    - source: salt://k8s/files/etc_docker_daemon.json
+    - mode: 644
+    - user: root
+    - group: root
diff --git a/k8s/init.sls b/k8s/init.sls
index 21b7dfb..43423b7 100644
--- a/k8s/init.sls
+++ b/k8s/init.sls
@@ -3,6 +3,7 @@
 ---
 include:
   - .admin
+  - .docker
   #- .filesystems
 
 
@@ -13,18 +14,9 @@ include:
     - user: root
     - group: root
 
-/etc/docker/daemon.json:
-  file.managed:
-    - source: salt://k8s/files/etc_docker_daemon.json
-    - mode: 644
-    - user: root
-    - group: root
-
-
 k8s_pkgs:
   pkg.installed:
     - pkgs:
-      - docker.io
       - cgroupfs-mount
       - debootstrap
       - kubectl
diff --git a/top.sls b/top.sls
index 382bc40..1faa4b2 100644
--- a/top.sls
+++ b/top.sls
@@ -8,6 +8,7 @@ base:
     - hardware
   'tumor*':
     - base.pki.ca
+    - k8s.docker
   'G@osarch:arm64 or G@osarch:armhf or G@osarch:armel':
     - match: compound
     - base.packages.arch.arm