Skip to content

K
k3s
Commit 494186f4 authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #20867 from dchen1107/docker

Auto commit by PR queue bot
parents 9942f6bf f07070d1
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
cluster/saltbase/salt/docker/init.sls
View file @ 494186f4
......@@ -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'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment