From 3b2e2377a5f1160ca6dcfdf3bfca344f9d596b1f Mon Sep 17 00:00:00 2001
From: noelmcloughlin <noel.mcloughlin@gmail.com>
Date: Wed, 14 Oct 2020 23:00:34 +0100
Subject: [PATCH] fix(cent7): install yum-plugin-versionlock too

---
 docker/codenamemap.yaml | 7 +++++++
 docker/map.jinja        | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/docker/codenamemap.yaml b/docker/codenamemap.yaml
index 0620a7ef..fa180304 100644
--- 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
index 16c6b136..5d057f5b 100644
--- 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) %}