From 6fe3023a3dbd312f4df95ac75a6ae291ca18509f Mon Sep 17 00:00:00 2001 From: Zach Loafman Date: Thu, 18 Feb 2016 14:28:13 -0800 Subject: [PATCH] Revert "Upgrade gce cluster to docker 1.9.1" This reverts commit f07070d129fb2feaf50a011e81348afe5b95a938. --- cluster/saltbase/salt/docker/init.sls | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cluster/saltbase/salt/docker/init.sls b/cluster/saltbase/salt/docker/init.sls index e71f1139d7a..6898f34da8e 100644 --- a/cluster/saltbase/salt/docker/init.sls +++ b/cluster/saltbase/salt/docker/init.sls @@ -203,10 +203,10 @@ net.ipv4.ip_forward: {% if grains.get('cloud', '') == 'gce' and grains.get('os_family', '') == 'Debian' and grains.get('oscodename', '') == 'wheezy' -%} -{% set docker_pkg_name='docker-engine' %} -{% set override_deb='docker-engine_1.9.1-0~wheezy_amd64.deb' %} -{% set override_deb_sha1='d682e2f0545e21f2d7309c2d87826aa566cc4af0' %} -{% set override_docker_ver='1.9.1' %} +{% set docker_pkg_name='' %} +{% set override_deb='' %} +{% set override_deb_sha1='' %} +{% set override_docker_ver='' %} # Ubuntu presents as os_family=Debian, osfullname=Ubuntu {% elif grains.get('cloud', '') == 'aws' and grains.get('os_family', '') == 'Debian'