add ability to upgrade salt minion and master for ubuntu

salt/salt/master.sls

@@ -1 +1,11 @@
-#Future state for Salt masters
+salt_master_package:
+  pkg.installed:
+    - pkgs:
+      - salt
+      - salt-master
+    - hold: True
+
+salt_minion_service:
+  service.running:
+    - name: salt-master
+    - enable: True

salt/salt/minion.sls

@@ -2,22 +2,33 @@ include:
   - salt
 
 {% import_yaml 'salt/minion.defaults.yaml' as salt %}
-{% set saltversion = salt.salt.minion.version %}
+{% set SALTVERSION = salt.salt.minion.version %}
+
+{% if grains.saltversion|string != SALTVERSION|string %}
+  {% if grains.os|lower == 'centos' %}
+    {% set UPGRADECOMMAND = 'yum versionlock delete "salt-*" && sh bootstrap-salt.sh -F -x python3 stable {{ SALTVERSION }}' %}
+  {% elif grains.os|lower == 'ubuntu' %}
+    {% set UPGRADECOMMAND = 'apt-mark unhold salt && apt-mark unhold salt-minion && sh bootstrap-salt.sh -F -x python3 stable {{ SALTVERSION }}' %}
+  {% endif %}
+{% else %}
+  {% set UPGRADECOMMAND = 'echo "Already running Salt Minon version {{ SALTVERSION }}"' %}
+{% endif %}
 
-{% if grains.os|lower == 'centos' %}
 install_salt_minion:
   cmd.run:
-    {% if grains.saltversion|string != saltversion|string %}
-    - name: yum versionlock delete "salt-*" && sh bootstrap-salt.sh -F -x python3 stable {{ saltversion }}
-    {% else %}
-    - name: echo 'Already running Salt Minon version {{ saltversion }}'
-    {% endif %}
+    - name: {{ UPGRADECOMMAND }} 
 
-versionlock_salt_minion:
-  module.run:
-    - pkg.hold:
-      - name: "salt-*"
-{% endif %}
+#versionlock_salt_minion:
+#  module.run:
+#    - pkg.hold:
+#      - name: "salt-*"
+
+salt_minion_package:
+  pkg.installed:
+    - pkgs:
+      - salt
+      - salt-minion
+    - hold: True
 
 salt_minion_service:
   service.running: