stuff

2020-04-19 15:17:14 +02:00
parent c3b5eb3ce6
commit 3f690eeefb
5 changed files with 4 additions and 12 deletions
--- a/base/init.sls
+++ b/base/init.sls
@@ -5,3 +5,4 @@
 include:
  - log.rsyslog.client
  - sys.sysctl
+  - kubernetes
--- a/base/sys/sysctl.sls
+++ b/base/sys/sysctl.sls
@@ -8,6 +8,7 @@ sysctl:
      location: '/etc/sysctl.d'
  params:
    vm.swappiness: 60
+    net.ipv4.ip_forward: 1
    net.core.rmem_max:
      value: 16777216
    net.core.wmem_max:
--- a/kubernetes.sls
+++ b/kubernetes.sls
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
---
-
-kubernetes:
-  minikube:
-    version: '1.9.0'
-    pkg:
-      binary:
-        source_hash: c161e8ffdbc8d7cc92c2f57809bf846ff73996f06bc6a757bef518b3acce5b47
--- a/prometheus/prometheus.sls
+++ b/prometheus/prometheus.sls
@@ -61,6 +61,7 @@ prometheus:
          static_configs:
            - targets:
              - dumont.chaos:9100
+              - dumont2.chaos:9100
              {% set roles = salt.saltutil.runner('mine.get',
                    tgt='*', 
                    fun='chaos_roles', 
--- a/top.sls
+++ b/top.sls
@@ -13,8 +13,7 @@ base:
    - grafana
    - prometheus.prometheus
    - base.log.rsyslog.client 
-    #- kubernetes
-  'osarch:arm64':
+  'osarch:arm64 or osarch:armel':
    - match: grain
    - base.log.rsyslog.client 
  'osarch:armhf and not fqdn:tumor.chaos':