fix(cent7): install yum-plugin-versionlock too

saltstack-formulas · Oct 15, 2020 · 3b2e237 · 3b2e237
1 parent 87c737c
commit 3b2e237
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/docker/codenamemap.yaml b/docker/codenamemap.yaml
@@ -34,3 +34,10 @@ precise:
  pkgs:
  - linux-image-generic-lts-raring
  - linux-headers-generic-lts-raring
+
+CentOS Linux 7 (Core):
+ pkgs:
+ - yum-plugin-versionlock
+ - python2-pip
+ # python-docker
+ - rpmdevtools
diff --git a/docker/map.jinja b/docker/map.jinja
@@ -38,12 +38,12 @@
 {% set osfamily = salt['grains.filter_by'](osfamilymap, grain='os_family') or {} %}
 {% do defaults.docker.update(osfamily) %}
 
-{% set oscode = salt['grains.filter_by'](codemap, grain='oscodename') or {} %}
-{% do defaults.docker.update(oscode) %}
-
 {% set os = salt['grains.filter_by'](osmap, grain='os') or {} %}
 {% do defaults.docker.update(os) %}
 
+{% set oscode = salt['grains.filter_by'](codemap, grain='oscodename') or {} %}
+{% do defaults.docker.update(oscode) %}
+
 {% set docker = salt['pillar.get']('docker', default=defaults['docker'], merge=True) %}
 
 {% set compose = salt['pillar.get']('docker:compose', default={}, merge=True) %}