From ba7345d9678715bcbc7936a72443f8cf5720c487 Mon Sep 17 00:00:00 2001 From: derekwaynecarr Date: Tue, 12 Aug 2014 16:10:59 -0400 Subject: [PATCH] Do not always look for latest pkg --- cluster/saltbase/salt/base.sls | 2 +- cluster/saltbase/salt/docker/init.sls | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cluster/saltbase/salt/base.sls b/cluster/saltbase/salt/base.sls index 5954b84243f..e0418f7acc5 100644 --- a/cluster/saltbase/salt/base.sls +++ b/cluster/saltbase/salt/base.sls @@ -1,5 +1,5 @@ pkg-core: - pkg.latest: + pkg.installed: - names: {% if grains['os_family'] == 'RedHat' %} - python diff --git a/cluster/saltbase/salt/docker/init.sls b/cluster/saltbase/salt/docker/init.sls index 6e06584cbf8..e154d64c6fd 100644 --- a/cluster/saltbase/salt/docker/init.sls +++ b/cluster/saltbase/salt/docker/init.sls @@ -26,7 +26,7 @@ net.ipv4.ip_forward: - value: 1 bridge-utils: - pkg.latest + pkg.installed cbr0: container_bridge.ensure: @@ -59,7 +59,7 @@ docker: - makedirs: true lxc-docker: - pkg.latest + pkg.installed # There is a race here, I think. As the package is installed, it will start # docker. If it doesn't write its pid file fast enough then this next stanza