fix(packages): corrected dependency packages & user:group

deepsea/defaults.yaml

@@ -7,9 +7,6 @@ deepsea:
   pkg:
     name: deepsea
     deps:
-      - python3-boto
-      - python3-rados
-      - python3-tox
       - lsscsi
       - jq
       - pciutils

deepsea/map.jinja

@@ -6,6 +6,7 @@
 {#- Start imports as #}
 {%- import_yaml tplroot ~ "/defaults.yaml" as default_settings %}
 {%- import_yaml tplroot ~ "/osfamilymap.yaml" as osfamilymap %}
+{%- import_yaml tplroot ~ "/osmap.yaml" as osmap %}
 
 {#- Retrieve the config dict only once #}
 {#- set _config = salt['config.get'](tplroot, default={}) #}
@@ -14,7 +15,9 @@
 {%- set defaults = salt['grains.filter_by']( default_settings,
       default=tplroot,
       merge=salt['grains.filter_by']( osfamilymap, grain='os_family',
-        merge=salt['grains.filter_by']( _config, default='lookup'
+        merge=salt['grains.filter_by']( osmap, grain='os',
+          merge=salt['grains.filter_by']( _config, default='lookup'
+          )
         )
       )
     )

deepsea/osfamilymap.yaml

@@ -14,7 +14,9 @@
 Debian:
   pkg:
     deps:
-      - python3-tox
+      - python3-boto3
+      - python3-rados
+      - tox
       - gdisk
       - iperf
 
@@ -24,6 +26,7 @@ RedHat:
     enabled: False
   pkg:
     deps:
+      - python-boto3
       - python3-netaddr
       - iperf3
       - gdisk
@@ -35,6 +38,8 @@ Suse:
     use_upstream_repo: True
     deps:
       - python3-tox
+      - python3-boto3
+      - python3-rados
       - gptfdisk
       - iperf
       - lsof
@@ -52,11 +57,26 @@ Suse:
 
 Gentoo: {}
 
-Arch: {}
+Arch:
+  pkg:
+    deps:
+      - python-tox
+      - python-boto3
+      - python3-rados
 
 Alpine: {}
 
-FreeBSD: {}
+FreeBSD:
+  pkg:
+    deps:
+      - py36-boto3
+      - py36-tox
+
+NetBSD:
+  pkg:
+    deps:
+      - py36-boto3
+      - py36-tox
 
 OpenBSD: {}
 

deepsea/osmap.yaml

@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+#
+# Setup variables using grains['os'] based logic.
+# You just need to add the key:values for an `os` that differ
+# from `defaults.yaml` + `os_family.yaml`.
+# Only add an `os` which is/will be supported by the formula
+#
+# If you do not need to provide defaults via the `os` grain,
+# you will need to provide at least an empty dict in this file, e.g.
+# osmap: {}
+---
+# os_family: Debian
+Ubuntu: {}
+
+Raspbian: {}
+
+# os_family: RedHat
+Fedora:
+  pkg:
+    deps:
+      - python3-boto
+      - python3-tox
+
+CentOS: {}
+
+# os_family: Suse
+openSUSE: {}
+
+# os_family: Gentoo
+Funtoo: {}
+
+# os_family: Arch
+Manjaro: {}
+
+# os_family: Solaris
+SmartOS: {}

deepsea/source/install.sls

@@ -5,6 +5,7 @@
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import deepsea with context %}
 {%- from tplroot ~ "/jinja/macros.jinja" import format_kwargs with context %}
+{%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}
 
 deepsea-package-source-install-file-directory:
   file.directory:
@@ -41,11 +42,20 @@ deepsea-package-source-install-source-extracted:
     - recurse:
         - user
         - group
+  file.managed:
+    - name: {{ deepsea.pkg.source.name }}/Makefile
+    - source: {{ files_switch(['Makefile'], lookup='deepsea-package-source-install-source-extracted') }}
 
 deepsea-package-source-install-cmd-run-make-install:
+  file.replace:
+    - name: /usr/bin/salt-api
+    - pattern: '/usr/bin/python2'
+    - repl: '/usr/bin/python3'
+    - onlyif: test -x /usr/bin/salt-api
   cmd.run:
     - cwd: {{ deepsea.pkg.source.name }}
-    - name: make install
+    - names:
+      - make install
     - unless:
       - test -f /usr/local/bin/deepsea
     - require: