merge with dev

salt/common/init.sls

@@ -107,10 +107,17 @@ commonpkgs:
 heldpackages:
   pkg.installed:
     - pkgs:
+    {% if grains['oscodename'] == 'bionic' %}
       - containerd.io: 1.4.4-1
       - docker-ce: 5:20.10.5~3-0~ubuntu-bionic
       - docker-ce-cli: 5:20.10.5~3-0~ubuntu-bionic
       - docker-ce-rootless-extras: 5:20.10.5~3-0~ubuntu-bionic
+    {% elif grains['oscodename'] == 'focal' %}
+      - containerd.io: 1.4.9-1
+      - docker-ce: 5:20.10.8~3-0~ubuntu-focal
+      - docker-ce-cli: 5:20.10.5~3-0~ubuntu-focal
+      - docker-ce-rootless-extras: 5:20.10.5~3-0~ubuntu-focal
+    {% endif %}
     - hold: True
     - update_holds: True
 

salt/common/tools/sbin/so-firewall

@@ -71,7 +71,7 @@ def checkApplyOption(options):
 
 def loadYaml(filename):
   file = open(filename, "r")
-  return yaml.load(file.read())
+  return yaml.safe_load(file.read())
 
 def writeYaml(filename, content):
   file = open(filename, "w")

salt/elastalert/init.sls

@@ -111,13 +111,13 @@ so-elastalert:
     - image: {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-elastalert:{{ VERSION }}
     - hostname: elastalert
     - name: so-elastalert
-    - user: elastalert
+    - user: so-elastalert
     - detach: True
     - binds:
       - /opt/so/rules/elastalert:/opt/elastalert/rules/:ro
       - /opt/so/log/elastalert:/var/log/elastalert:rw
       - /opt/so/conf/elastalert/modules/:/opt/elastalert/modules/:ro
-      - /opt/so/conf/elastalert/elastalert_config.yaml:/opt/config/elastalert_config.yaml:ro
+      - /opt/so/conf/elastalert/elastalert_config.yaml:/opt/elastalert/config.yaml:ro
     - extra_hosts:
       - {{MANAGER_URL}}:{{MANAGER_IP}}
     - require:

salt/mysql/init.sls

@@ -22,7 +22,11 @@ mysqlpkgs:
     - skip_suggestions: False
     - pkgs:
       {% if grains['os'] != 'CentOS' %}
-      - python-mysqldb
+        {% if grains['oscodename'] == 'bionic' %}
+      - python3-mysqldb
+        {% elif grains['oscodename'] == 'focal' %}
+      - python3-mysqldb
+        {% endif %}
       {% else %}
       - MySQL-python
       {% endif %}

salt/salt/init.sls

@@ -2,8 +2,13 @@
 saltpymodules:
   pkg.installed:
     - pkgs:
-      - python-docker
+      {% if grains['oscodename'] == 'bionic' %}
       - python-m2crypto
+      - python-docker
+      {% elif grains['oscodename'] == 'focal' %}
+      - python3-m2crypto
+      - python3-docker
+      {% 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"

salt/ssl/init.sls

@@ -42,7 +42,11 @@ m2cryptopkgs:
   pkg.installed:
     - skip_suggestions: False
     - pkgs:
+    {% if grains['oscodename'] == 'bionic' %}
       - python-m2crypto
+    {% elif grains['oscodename'] == 'focal' %}
+      - python3-m2crypto
+    {% endif %}
 {% endif %}
 
 removefbcertdir: