Fix package versions

This commit is contained in:
Mike Reeves
2020-05-24 10:56:30 -04:00
parent 1c207afb31
commit 31b3563fb3
2 changed files with 7 additions and 7 deletions

View File

@@ -98,18 +98,18 @@ commonpkgs:
- device-mapper-persistent-data
- lvm2
- openssl
- salt-minion: 2019.2.5
- salt-minion: 2019.2.5.el7
- hold: True
- update_holds: True
{% if grains['role'] == 'so-master' or grains['role'] == 'so-eval' or grains['role'] == 'so-helix' or grains['role'] == 'so-mastersearch' or grains['role'] == 'so-standalone' %}
- salt-master: 2019.2.5
- salt-master: 2019.2.5.el7
- hold: True
- update_holds: True
{% endif %}
- containerd.io: 1.2.6-3
- containerd.io: 1.2.6-3.el7
- hold: True
- update_holds: True
- docker-ce: 19.03.9-3
- docker-ce: 19.03.9-3.el7
- hold: True
- update_holds: True
{% endif %}%}

View File

@@ -583,9 +583,9 @@ docker_install() {
{
yum clean expire-cache;
yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo;
yum -y install docker-ce-19.03.9-3 containerd.io-1.2.6-3;
yum versionlock docker-ce;
yum versionlock containerd.io
yum -y install docker-ce-19.03.9-3.el7 containerd.io-1.2.6-3.el7;
yum versionlock docker-ce-19.03.9-3.el7;
yum versionlock containerd.io-1.2.6-3.el7
} >> "$setup_log" 2>&1
else