Ubuntu 20.04 Support

salt/salt/init.sls

@@ -3,7 +3,11 @@ saltpymodules:
   pkg.installed:
     - pkgs:
       - python-docker
+      {% if grains['codename'] == 'bionic' %}
       - python-m2crypto
+      {% elif grains['codename'] == 'focal' %}
+      - python3-m2crypto
+      {% endif %}
 {% endif %}
 
 salt_bootstrap:

salt/salt/scripts/bootstrap-salt.sh

@@ -3082,7 +3082,11 @@ install_ubuntu_git_deps() {
                 __PACKAGES="${__PACKAGES} python3-setuptools"
             else
                 # There is no m2crypto package for Py3 at this time - only install for Py2
+                if [ $DISTRO_CODENAME == "focal" ]; then
+                __PACKAGES="${__PACKAGES} python3-m2crypto"
+                else
                 __PACKAGES="${__PACKAGES} python-m2crypto"
+                fi
             fi
 
             __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-crypto python${PY_PKG_VER}-jinja2"