From 36ab65aaf097d58453eca27acd93956082ff22e9 Mon Sep 17 00:00:00 2001
From: do <do@maketank.net>
Date: Tue, 9 Jun 2020 14:59:04 +0200
Subject: [PATCH] hardware grains fix and lenny gets his own package list

---
 _grains/hardware.py           | 3 ++-
 base/packages/init.sls        | 1 -
 base/packages/node/lenny.sls  | 7 ++++---
 hardware/raspberrypi/init.sls | 2 +-
 top.sls                       | 1 +
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/_grains/hardware.py b/_grains/hardware.py
index 27965f7..a5c6256 100644
--- a/_grains/hardware.py
+++ b/_grains/hardware.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 import re
+import os.path
 
 def _hardware():
     h = "unknown"
@@ -12,7 +13,7 @@ def _hardware():
             h = "Pine64"
         if re.match("Hardware\s+:\sFreescale\si.MX6\sQuad\/DualLite", line):
             h = "RiotBoard"
-    if h == "unknown":
+    if h == "unknown" and os.path.isfile("/etc/armbian-release"):
         for line in open("/etc/armbian-release","r").readlines():
             if re.match("BOARD=espressobin", line):
                 h = "Espressobin"
diff --git a/base/packages/init.sls b/base/packages/init.sls
index d1e7b81..7be2210 100644
--- a/base/packages/init.sls
+++ b/base/packages/init.sls
@@ -5,4 +5,3 @@
 include:
   - .common
   - .repo.maketank
-  - .node.{{ grains['nodename'] }}
diff --git a/base/packages/node/lenny.sls b/base/packages/node/lenny.sls
index be02953..30a4e4c 100644
--- a/base/packages/node/lenny.sls
+++ b/base/packages/node/lenny.sls
@@ -1,4 +1,4 @@
-common-installed:
+lenny-installed:
   pkg.installed:
    - pkgs:
      # for FREECAD
@@ -24,9 +24,9 @@ common-installed:
      - libgts-dev
      - libkdtree++-dev
      - libmedc-dev
-     - libopencv-dev or libcv-dev
+     - libopencv-dev
      - libproj-dev
-     - libvtk7-dev or libvtk6-dev
+     - libvtk7-dev
      - libx11-dev
      - libxerces-c-dev
      - libzipios++-dev
@@ -58,4 +58,5 @@ common-installed:
      - libocct-visualization-dev
      - occt-draw
      - libsimage-dev
+     - dh-make
      # /for FREECAD
diff --git a/hardware/raspberrypi/init.sls b/hardware/raspberrypi/init.sls
index d7baed4..83478de 100644
--- a/hardware/raspberrypi/init.sls
+++ b/hardware/raspberrypi/init.sls
@@ -14,7 +14,7 @@ set has_fan = salt['pillar.get'](
 
 include:
 {%- if 'node_exporter' in has_promexporter %}
- - .prometheus-exporter
+  - .prometheus-exporter
 {%- endif %}
 {%- if has_fan %}
   - .fan
diff --git a/top.sls b/top.sls
index 769e88d..4004135 100644
--- a/top.sls
+++ b/top.sls
@@ -23,6 +23,7 @@ base:
     - k8s
   'lenny*':
     - k8s.admin
+    - base.packages.node.lenny
   #'ebin*':
   #  - ceph
   #  - ceph.osd