From 2d25e352d4fe201d442b82cf233d412a5ad6258d Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 9 Aug 2023 08:18:13 -0400 Subject: [PATCH] write to adv_ pillar file since that is where it would be stored from using the soc ui --- salt/common/tools/sbin_jinja/so-desktop-install | 2 +- salt/desktop/packages.sls | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/salt/common/tools/sbin_jinja/so-desktop-install b/salt/common/tools/sbin_jinja/so-desktop-install index 2eb5c209f..06385e810 100755 --- a/salt/common/tools/sbin_jinja/so-desktop-install +++ b/salt/common/tools/sbin_jinja/so-desktop-install @@ -13,7 +13,7 @@ source /usr/sbin/so-common doc_desktop_url="$DOC_BASE_URL/desktop.html" -pillar_file="/opt/so/saltstack/local/pillar/minions/{{grains.id}}.sls" +pillar_file="/opt/so/saltstack/local/pillar/minions/adv_{{grains.id}}.sls" if [ -f "$pillar_file" ]; then if ! grep -q "^desktop:$" "$pillar_file"; then diff --git a/salt/desktop/packages.sls b/salt/desktop/packages.sls index 5c0121e7b..524c2c266 100644 --- a/salt/desktop/packages.sls +++ b/salt/desktop/packages.sls @@ -3,7 +3,6 @@ {# we only want this state to run it is CentOS #} {% if GLOBALS.os == 'OEL' %} - desktop_packages: pkg.installed: - pkgs: