From 481ffb1cda760556f743092184c523a18b8eae46 Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Mon, 20 Sep 2021 18:12:18 -0400
Subject: [PATCH] Fix Grain

---
 salt/common/init.sls | 4 ++--
 salt/mysql/init.sls  | 4 ++--
 salt/salt/init.sls   | 4 ++--
 salt/ssl/init.sls    | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/salt/common/init.sls b/salt/common/init.sls
index 18c70747a..f993534b3 100644
--- a/salt/common/init.sls
+++ b/salt/common/init.sls
@@ -107,12 +107,12 @@ commonpkgs:
 heldpackages:
   pkg.installed:
     - pkgs:
-    {% if grains['codename'] == 'bionic' %}
+    {% 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['codename'] == 'focal' %}
+    {% 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
diff --git a/salt/mysql/init.sls b/salt/mysql/init.sls
index 04cbacc99..46e62fcc0 100644
--- a/salt/mysql/init.sls
+++ b/salt/mysql/init.sls
@@ -22,9 +22,9 @@ mysqlpkgs:
     - skip_suggestions: False
     - pkgs:
       {% if grains['os'] != 'CentOS' %}
-        {% if grains['codename'] == 'bionic' %}
+        {% if grains['oscodename'] == 'bionic' %}
       - python3-mysqldb
-        {% elif grains['codename'] == 'focal' %}
+        {% elif grains['oscodename'] == 'focal' %}
       - python3-mysqldb
         {% endif %}
       {% else %}
diff --git a/salt/salt/init.sls b/salt/salt/init.sls
index d01fe1958..504ddbcd5 100644
--- a/salt/salt/init.sls
+++ b/salt/salt/init.sls
@@ -3,9 +3,9 @@ saltpymodules:
   pkg.installed:
     - pkgs:
       - python-docker
-      {% if grains['codename'] == 'bionic' %}
+      {% if grains['oscodename'] == 'bionic' %}
       - python-m2crypto
-      {% elif grains['codename'] == 'focal' %}
+      {% elif grains['oscodename'] == 'focal' %}
       - python3-m2crypto
       {% endif %}
 {% endif %}
diff --git a/salt/ssl/init.sls b/salt/ssl/init.sls
index 54c48ab34..5690691fc 100644
--- a/salt/ssl/init.sls
+++ b/salt/ssl/init.sls
@@ -42,9 +42,9 @@ m2cryptopkgs:
   pkg.installed:
     - skip_suggestions: False
     - pkgs:
-    {% if grains['codename'] == 'bionic' %}
+    {% if grains['oscodename'] == 'bionic' %}
       - python-m2crypto
-    {% elif grains['codename'] == 'focal' %}
+    {% elif grains['oscodename'] == 'focal' %}
       - python3-m2crypto
     {% endif %}
 {% endif %}