scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-12-02 06:13:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a network plugin that duplicates "configureCBR0" functionality

Browse Source
This commit is contained in:
Dan Williams
2015-12-16 17:31:10 -06:00
parent 67414afd11
commit fabb65c13f
18 changed files with 502 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/saltbase/salt/docker/docker-defaults
View File

@@ -3,5 +3,9 @@
{% if pillar.get('e2e_storage_test_environment', '').lower() == 'true' -%}
{% set e2e_opts = '-s devicemapper' -%}
{% endif -%}
DOCKER_OPTS="{{grains_opts}} {{e2e_opts}} --bridge=cbr0 --iptables=false --ip-masq=false --log-level=warn"
{% set bridge_opts = "--bridge=cbr0" %}
{% if pillar.get('network_provider', '').lower() == 'kubenet' %}
{% set bridge_opts = "" %}
{% endif -%}
DOCKER_OPTS="{{grains_opts}} {{e2e_opts}} {{bridge_opts}} --iptables=false --ip-masq=false --log-level=warn"
DOCKER_NOFILE=1000000