From ccf4b381db8a16d3653c43efd0fefcd90e9426a1 Mon Sep 17 00:00:00 2001 From: Jeremy Lewi Date: Tue, 3 May 2016 22:17:38 -0700 Subject: [PATCH] Add an entry to the salt config to allow Debian jessie on GCE. As with the existing Wheezy image on GCE, docker is expected to already be installed in the image. --- cluster/saltbase/salt/docker/init.sls | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cluster/saltbase/salt/docker/init.sls b/cluster/saltbase/salt/docker/init.sls index bf80af111e2..a27779a4efc 100644 --- a/cluster/saltbase/salt/docker/init.sls +++ b/cluster/saltbase/salt/docker/init.sls @@ -214,6 +214,14 @@ net.ipv4.ip_forward: {% set override_deb_sha1='' %} {% set override_docker_ver='' %} +{% elif grains.get('cloud', '') == 'gce' + and grains.get('os_family', '') == 'Debian' + and grains.get('oscodename', '') == 'jessie' -%} +{% set docker_pkg_name='' %} +{% set override_deb='' %} +{% set override_deb_sha1='' %} +{% set override_docker_ver='' %} + {% elif grains.get('cloud', '') == 'aws' and grains.get('os_family', '') == 'Debian' and grains.get('oscodename', '') == 'jessie' -%}