hardware grains fix and lenny gets his own package list

_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"

base/packages/init.sls

@@ -5,4 +5,3 @@
 include:
   - .common
   - .repo.maketank
-  - .node.{{ grains['nodename'] }}

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

top.sls

@@ -23,6 +23,7 @@ base:
     - k8s
   'lenny*':
     - k8s.admin
+    - base.packages.node.lenny
   #'ebin*':
   #  - ceph
   #  - ceph.osd