github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade to Fedora 21, Docker 1.6, clean-up SDN

Browse Source
This commit is contained in:
derekwaynecarr
2015-06-01 21:19:38 -04:00
parent a161edb396
commit 2168cee414
11 changed files with 137 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cluster/saltbase/salt/docker/default Normal file
View File

@@ -0,0 +1,8 @@
{% set docker_opts = "" -%}
{% if grains.docker_opts is defined -%}
{% set docker_opts = grains.docker_opts -%}
{% endif -%}
DOCKER_OPTS='{{docker_opts}}'
OPTIONS='{{docker_opts}}'
DOCKER_CERT_PATH=/etc/docker