Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
6d08ade4
Commit
6d08ade4
authored
Jul 07, 2015
by
Brendan Burns
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't start Docker by default on AWS
parent
2e282013
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
2 deletions
+10
-2
init.sls
cluster/saltbase/salt/docker/init.sls
+10
-2
No files found.
cluster/saltbase/salt/docker/init.sls
View file @
6d08ade4
...
@@ -114,11 +114,19 @@ lxc-docker-{{ override_docker_ver }}:
...
@@ -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:
...
@@ -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'
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment