Merge pull request #83 from salt-formulas/pr/preinstall-apt-https-tranpsort2

avoid install system pkgs before repo configured

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': {},

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': [],

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) %}
@@ -114,7 +115,7 @@ linux_repo_{{ name }}:
   - 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 %}
@@ -152,7 +153,7 @@ linux_repo_{{ name }}:
   - gpgkey: {{ repo.gpgkey }}
   {%- endif %}
   - require:
-    - pkg: linux_packages
+    - pkg: linux_repo_prereq_pkgs
 
 {%- endif %}
 
@@ -176,7 +177,7 @@ default_repo_list:
     - defaults:
         default_repos: {{ default_repos }}
     - require:
-      - pkg: linux_packages
+      - pkg: linux_repo_prereq_pkgs
 
 {%- endif %}