From 2c996fe7ad334e5f00e23da92403e30267a14891 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 13 Jul 2023 10:54:04 -0400 Subject: [PATCH] Initial Oracle support --- salt/mysql/config.sls | 2 +- salt/ntp/init.sls | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/salt/mysql/config.sls b/salt/mysql/config.sls index 1396adb90..53f0a1318 100644 --- a/salt/mysql/config.sls +++ b/salt/mysql/config.sls @@ -12,7 +12,7 @@ mysqlpkgs: pkg.installed: - skip_suggestions: False - pkgs: - {% if grains['os'] != 'Rocky' %} + {% if grains['os_family'] != 'RedHat' %} {% if grains['oscodename'] == 'bionic' %} - python3-mysqldb {% elif grains['oscodename'] == 'focal' %} diff --git a/salt/ntp/init.sls b/salt/ntp/init.sls index 9c0c3dcb2..1fc523e94 100644 --- a/salt/ntp/init.sls +++ b/salt/ntp/init.sls @@ -17,9 +17,7 @@ chronyconf: - defaults: NTPCONFIG: {{ NTPCONFIG }} -{% if GLOBALS.os == 'Rocky' %} -chronyd: -{% elif GLOBALS.os == 'CentOS Stream' %} +{% if GLOBALS.os_family == 'RedHat' %} chronyd: {% else %} chrony: