handle salt-cloud package

salt/salt/master.sls

@@ -8,6 +8,9 @@
 
 include:
   - salt.minion
+{%   if salt['pillar.get']('hypervisor:nodes', {} ) %}
+  - salt.cloud
+{% endif %}
 
 hold_salt_master_package:
   module.run:

salt/salt/minion.sls

@@ -37,12 +37,14 @@ install_salt_minion:
 {% endif %}
 
 {% if INSTALLEDSALTVERSION|string == SALTVERSION|string %}
-
+# only hold the package if it is already installed
 hold_salt_packages:
   pkg.held:
     - pkgs:
 {%   for package in SALTPACKAGES %}
+{%     if salt['pkg.version'](package) %}
       - {{ package }}: {{SALTVERSION}}-0.*
+{%     endif %}
 {%   endfor %}
 
 remove_error_log_level_logfile: