avoid install system pkgs before repo configured
diff --git a/linux/map.jinja b/linux/map.jinja
index 045212d..a0b6112 100644
--- a/linux/map.jinja
+++ b/linux/map.jinja
@@ -21,7 +21,7 @@
'doc_validity_pkgs': ['python-yaml'],
},
'Debian': {
- 'pkgs': ['python-apt','vim-nox', 'apt-transport-https', 'libmnl0'],
+ 'pkgs': ['python-apt', 'apt-transport-https', 'libmnl0'],
'utc': true,
'user': {},
'group': {},
@@ -42,7 +42,7 @@
'doc_validity_pkgs': ['python-yaml'],
},
'RedHat': {
- 'pkgs': ['policycoreutils', 'policycoreutils-python', 'vim-enhanced', 'telnet', 'wget'],
+ 'pkgs': ['policycoreutils', 'policycoreutils-python', 'telnet', 'wget'],
'utc': true,
'user': {},
'group': {},
diff --git a/linux/system/package.sls b/linux/system/package.sls
index d37c3c5..95db674 100644
--- a/linux/system/package.sls
+++ b/linux/system/package.sls
@@ -1,10 +1,6 @@
{%- from "linux/map.jinja" import system with context %}
{%- if system.enabled %}
-linux_packages:
- pkg.installed:
- - pkgs: {{ system.pkgs }}
-
{%- set pkgs_groups = {
'latest': [],
'purged': [],
diff --git a/linux/system/repo.sls b/linux/system/repo.sls
index 6520d88..cb9c8bd 100644
--- a/linux/system/repo.sls
+++ b/linux/system/repo.sls
@@ -1,8 +1,9 @@
{%- from "linux/map.jinja" import system with context %}
{%- if system.enabled %}
-include:
-- linux.system.package
+linux_repo_prereq_pkgs:
+ pkg.installed:
+ - pkgs: {{ system.pkgs }}
# global proxy setup
{%- if system.proxy.get('pkg', {}).get('enabled', False) %}
@@ -105,7 +106,7 @@
- clean_file: {{ repo.get('clean_file', False) }}
- refresh_db: {{ repo.get('refresh_db', True) }}
- require:
- - pkg: linux_packages
+ - pkg: linux_repo_prereq_pkgs
{%- if repo.get('proxy', {}).get('enabled', False) %}
- file: /etc/apt/apt.conf.d/99proxies-salt-{{ name }}
{%- endif %}
@@ -140,7 +141,7 @@
- gpgkey: {{ repo.gpgkey }}
{%- endif %}
- require:
- - pkg: linux_packages
+ - pkg: linux_repo_prereq_pkgs
{%- endif %}
@@ -161,7 +162,7 @@
- defaults:
default_repos: {{ default_repos }}
- require:
- - pkg: linux_packages
+ - pkg: linux_repo_prereq_pkgs
{%- endif %}