github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Don't start Docker by default on AWS

pull/6/head
Brendan Burns 2015-07-07 20:31:48 -07:00
parent fadb9e16d4
commit 2c5e4a9555
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,11 +114,19 @@ lxc-docker-{{ override_docker_ver }}:
- lxc-docker-{{ override_docker_ver }}: /var/cache/docker-install/{{ override_deb }} - lxc-docker-{{ override_docker_ver }}: /var/cache/docker-install/{{ override_deb }}
- require: - require:
- file: /var/cache/docker-install/{{ override_deb }} - file: /var/cache/docker-install/{{ override_deb }}
{% endif %} {% endif %} # end override_docker_ver != ''
docker: docker:
service.running: service.running:
# Starting Docker is racy on aws for some reason. To be honest, since Monit
# is managing Docker restart we should probably just delete this whole thing
# but the kubernetes components use salt 'require' to set up a dag, and that
# complicated and scary to unwind.
{% if grains.cloud is defined and grains.cloud == 'aws' %}
- enable: False
{% else %}
- enable: True - enable: True
{% endif %}
- watch: - watch:
- file: {{ environment_file }} - file: {{ environment_file }}
{% if override_docker_ver != '' %} {% if override_docker_ver != '' %}
@ -126,4 +134,4 @@ docker:
- pkg: lxc-docker-{{ override_docker_ver }} - pkg: lxc-docker-{{ override_docker_ver }}
{% endif %} {% endif %}
{% endif %} {% endif %} # end grains.os_family != 'RedHat'