github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 15:58:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #20867 from dchen1107/docker

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-02-09 10:02:44 -08:00
commit 494186f40e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cluster/saltbase/salt/docker/init.sls
View File

@ -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='' %}
{% set override_deb='' %}
{% set override_deb_sha1='' %}
{% set override_docker_ver='' %}
{% 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' %}
# Ubuntu presents as os_family=Debian, osfullname=Ubuntu
{% elif grains.get('cloud', '') == 'aws'
and grains.get('os_family', '') == 'Debian'