From b45e114ef25389be5fb97d1a8dc896e8b872d887 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 30 Aug 2023 10:41:34 -0400 Subject: [PATCH] cant use GLOBALS var due to desktop nongrid install --- salt/desktop/packages.sls | 4 +--- salt/desktop/remove_gui.sls | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/salt/desktop/packages.sls b/salt/desktop/packages.sls index 524c2c266..3817f2e80 100644 --- a/salt/desktop/packages.sls +++ b/salt/desktop/packages.sls @@ -1,7 +1,5 @@ -{% from 'vars/globals.map.jinja' import GLOBALS %} - {# we only want this state to run it is CentOS #} -{% if GLOBALS.os == 'OEL' %} +{% if grains.os == 'OEL' %} desktop_packages: pkg.installed: diff --git a/salt/desktop/remove_gui.sls b/salt/desktop/remove_gui.sls index 53d927cbe..d8de07a9a 100644 --- a/salt/desktop/remove_gui.sls +++ b/salt/desktop/remove_gui.sls @@ -1,7 +1,5 @@ -{% from 'vars/globals.map.jinja' import GLOBALS %} - {# we only want this state to run it is CentOS #} -{% if GLOBALS.os == 'OEL' %} +{% if grains.os == 'OEL' %} remove_graphical_target: file.symlink: