Skip to content

K
k3s
Commit ccf4b381 authored by Jeremy Lewi's avatar Jeremy Lewi
Browse files
Options

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.
parent 43b644ea
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 0 deletions
cluster/saltbase/salt/docker/init.sls
View file @ ccf4b381
...@@ -214,6 +214,14 @@ net.ipv4.ip_forward: ...@@ -214,6 +214,14 @@ net.ipv4.ip_forward:
{% set override_deb_sha1='' %} {% set override_deb_sha1='' %}
{% set override_docker_ver='' %} {% 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' {% elif grains.get('cloud', '') == 'aws'
and grains.get('os_family', '') == 'Debian' and grains.get('os_family', '') == 'Debian'
and grains.get('oscodename', '') == 'jessie' -%} and grains.get('oscodename', '') == 'jessie' -%}
......
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