From 9d01387a04725611b3c7b96cafbd9bebe48070c8 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Thu, 15 Apr 2021 11:57:25 -0400 Subject: [PATCH] remove references to the common salt package --- salt/salt/master.sls | 12 ++++-------- salt/salt/minion.sls | 1 - 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/salt/salt/master.sls b/salt/salt/master.sls index 3c23bbb36..d0a655051 100644 --- a/salt/salt/master.sls +++ b/salt/salt/master.sls @@ -1,17 +1,13 @@ {% from 'allowed_states.map.jinja' import allowed_states %} {% if sls in allowed_states %} -{% from 'salt/map.jinja' import COMMON with context %} - include: - salt.minion -salt_master_package: - pkg.installed: - - pkgs: - - {{ COMMON }} - - salt-master - - hold: True +hold_salt_master_package: + module.run: + - pkg.hold: + - 'salt-master' salt_master_service: service.running: diff --git a/salt/salt/minion.sls b/salt/salt/minion.sls index 6488124f6..e656ae8a6 100644 --- a/salt/salt/minion.sls +++ b/salt/salt/minion.sls @@ -1,4 +1,3 @@ -{% from 'salt/map.jinja' import COMMON with context %} {% from 'salt/map.jinja' import UPGRADECOMMAND with context %} {% from 'salt/map.jinja' import SALTVERSION %} {% from 'salt/map.jinja' import INSTALLEDSALTVERSION %}