From 1952f86f737509e8390a5cade270ded85984ae7d Mon Sep 17 00:00:00 2001 From: Jan Philipp Timme <jan.philipp@timme.it> Date: Fri, 12 Aug 2016 15:25:21 +0200 Subject: [PATCH] Fix conflicting id in packages.sls --- hshbase/packages.sls | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hshbase/packages.sls b/hshbase/packages.sls index 1366cd8..66d7fc5 100644 --- a/hshbase/packages.sls +++ b/hshbase/packages.sls @@ -1,6 +1,6 @@ -# Always ships this packages - we need them for grains +# Always install these packages {% if grains['os'] == 'Debian' or grains['os'] == 'Ubuntu' %} -hsh_python_packages_salt: +hsh_common_packages_salt: pkg.installed: - pkgs: - git @@ -12,7 +12,7 @@ hsh_python_packages_salt: - traceroute {% elif grains['os'] == 'FreeBSD' %} -hsh_python_packages_salt: +hsh_common_packages_salt: pkg.installed: - pkgs: - git -- GitLab