Merge pull request #358 from iustinam/pkgver

Add configuration for packages version

pillar.example

@@ -14,6 +14,9 @@ salt:
   # install Salt via git/pip/etc.)
   install_packages: True
 
+  # Optional: set salt version (if install_packages is set to True)
+  version: 2017.7.2-1.el7
+
   # to overwrite map.jinja salt packages
   lookup:
     salt_master: 'salt-master'

salt/api.sls

@@ -7,6 +7,9 @@ salt-api:
 {% if salt_settings.install_packages %}
   pkg.installed:
     - name: {{ salt_settings.salt_api }}
+  {%- if salt_settings.version is defined %}
+    - version: {{ salt_settings.version }}
+  {%- endif %}
 {% endif %}
   service.running:
     - enable: True

salt/cloud.sls

@@ -20,6 +20,9 @@ salt-cloud-pip-packages:
 salt-cloud:
   pkg.installed:
     - name: {{ salt_settings.salt_cloud }}
+    {%- if salt_settings.version is defined %}
+    - version: {{ salt_settings.version }}
+    {%- endif %}
     {%- if salt_settings.use_pip %}
     - require:
       - pip: salt-cloud-pip-packages

salt/master.sls

@@ -4,6 +4,9 @@ salt-master:
 {% if salt_settings.install_packages %}
   pkg.installed:
     - name: {{ salt_settings.salt_master }}
+  {%- if salt_settings.version is defined %}
+    - version: {{ salt_settings.version }}
+  {%- endif %}
 {% endif %}
   file.recurse:
     - name: {{ salt_settings.config_path }}/master.d

salt/minion.sls

@@ -5,6 +5,9 @@ salt-minion:
 {% if salt_settings.install_packages %}
   pkg.installed:
     - name: {{ salt_settings.salt_minion }}
+  {%- if salt_settings.version is defined %}
+    - version: {{ salt_settings.version }}
+  {%- endif %}
 {% endif %}
   file.recurse:
     - name: {{ salt_settings.config_path }}/minion.d

salt/ssh.sls

@@ -4,6 +4,9 @@
 ensure-salt-ssh-is-installed:
   pkg.installed:
     - name: {{ salt_settings.salt_ssh }}
+  {%- if salt_settings.version is defined %}
+    - version: {{ salt_settings.version }}
+  {%- endif %}
 {% endif %}
 
 ensure-roster-config:

salt/standalone.sls

@@ -4,6 +4,9 @@ salt-minion:
 {% if salt_settings.install_packages %}
   pkg.installed:
     - name: {{ salt_settings.salt_minion }}
+  {%- if salt_settings.version is defined %}
+    - version: {{ salt_settings.version }}
+  {%- endif %}
 {% endif %}
   file.recurse:
     - name: {{ salt_settings.config_path }}/minion.d

salt/syndic.sls

@@ -7,6 +7,9 @@ salt-syndic:
 {% if salt_settings.install_packages %}
   pkg.installed:
     - name: {{ salt_settings.salt_syndic }}
+  {%- if salt_settings.version is defined %}
+    - version: {{ salt_settings.version }}
+  {%- endif %}    
 {% endif %}
   service.running:
     - enable: True