refatoring of k8s and no more gluster

This commit is contained in:
do
2020-09-21 11:41:26 +02:00
parent 42dfed1e1f
commit 286c713b56
5 changed files with 21 additions and 12 deletions

View File

@@ -5,7 +5,7 @@
include:
- .packages
- .pki
- .gluster.client
#- .gluster.client
- sysctl
- rsyslog
- sudoers

View File

@@ -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]

16
k8s/docker.sls Normal file
View File

@@ -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

View File

@@ -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

View File

@@ -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