Merge pull request kubernetes#25152 from roberthbailey/automated-cher…

…ry-pick-of-#25123-upstream-release-1.2 Automated cherry pick of kubernetes#25123
shyamjvs · May 5, 2016 · 42e3729 · 42e3729
2 parents 11a2a48 + 3fab0e2
commit 42e3729
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/cluster/saltbase/salt/docker/init.sls b/cluster/saltbase/salt/docker/init.sls
@@ -213,6 +213,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' -%}