From df99e1cdcca1f11158bc03081a1a41673c6f1842 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20B=C3=A9rtoli?= <javier@netmanagers.com.ar>
Date: Sun, 10 Mar 2019 22:47:54 -0300
Subject: [PATCH] Fix dependency on states

As per https://docs.saltstack.com/en/latest/ref/states/requisites.html#require,
the `require` dependency on a sls file needs an include, which was missing
---
 packages/gems.sls  | 7 +++++++
 packages/npms.sls  | 7 +++++++
 packages/pips.sls  | 7 +++++++
 packages/pkgs.sls  | 7 +++++++
 packages/snaps.sls | 5 +++++
 pillar.example     | 4 ++--
 6 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/packages/gems.sls b/packages/gems.sls
index df98299..2fd2b00 100644
--- a/packages/gems.sls
+++ b/packages/gems.sls
@@ -7,6 +7,13 @@
 {% set wanted_gems = packages.gems.wanted %}
 {% set unwanted_gems = packages.gems.unwanted %}
 
+{% if req_states %}
+include:
+  {% for dep in req_states %}
+  - {{ dep }}
+  {% endfor %}
+{% endif %}
+
 ### REQ PKGS (without these, some of the WANTED GEMS will fail to install)
 gem_req_pkgs:
   pkg.installed:
diff --git a/packages/npms.sls b/packages/npms.sls
index 4bea20a..f57a7a0 100644
--- a/packages/npms.sls
+++ b/packages/npms.sls
@@ -7,6 +7,13 @@
 {% set wanted_npms = packages.npms.wanted %}
 {% set unwanted_npms = packages.npms.unwanted %}
 
+{% if req_states %}
+include:
+  {% for dep in req_states %}
+  - {{ dep }}
+  {% endfor %}
+{% endif %}
+
 ### REQ PKGS (without these, some of the WANTED PIPS will fail to install)
 npm_req_pkgs:
   pkg.installed:
diff --git a/packages/pips.sls b/packages/pips.sls
index 45cd6ae..064abb3 100644
--- a/packages/pips.sls
+++ b/packages/pips.sls
@@ -8,6 +8,13 @@
 {% set unwanted_pips = packages.pips.unwanted %}
 {% set pip_config = packages.pips.config %}
 
+{% if req_states %}
+include:
+  {% for dep in req_states %}
+  - {{ dep }}
+  {% endfor %}
+{% endif %}
+
 ### REQ PKGS (without these, some of the WANTED PIPS will fail to install)
 pip_req_pkgs:
   pkg.installed:
diff --git a/packages/pkgs.sls b/packages/pkgs.sls
index 06b77a3..8948c77 100644
--- a/packages/pkgs.sls
+++ b/packages/pkgs.sls
@@ -9,6 +9,13 @@
 {% set wanted_packages = packages.pkgs.wanted %}
 {% set unwanted_packages = packages.pkgs.unwanted %}
 
+{% if req_states %}
+include:
+  {% for dep in req_states %}
+  - {{ dep }}
+  {% endfor %}
+{% endif %}
+
 ### PRE-REQ PKGS (without these, some of the WANTED PKGS will fail to install)
 pkg_req_pkgs:
   pkg.installed:
diff --git a/packages/snaps.sls b/packages/snaps.sls
index 66b8c3d..1c65134 100644
--- a/packages/snaps.sls
+++ b/packages/snaps.sls
@@ -18,6 +18,11 @@
 ### REQ PKGS (without this, SNAPS can fail to install/uninstall)
 include:
   - packages.pkgs
+  {% if req_states %}
+    {% for dep in req_states %}
+  - {{ dep }}
+    {% endfor %}
+  {% endif %}
 
 extend: 
   unwanted_pkgs:
diff --git a/pillar.example b/pillar.example
index 92d25f6..9212648 100644
--- a/pillar.example
+++ b/pillar.example
@@ -70,8 +70,8 @@ packages:
     # env: None                  # A list of environment variables to be set prior to execution
     # force_reinstall: False     # Install the package even if it is already installed
     required:
-      pkgs:
-        - nodejs
+      states:
+        - node.pkg
     wanted:
       # Valid formats:
       #