46e6df655f
Use of NETWORK_PROVIDER=cni is documented as useable (as well as it's affects on the runtime args of kubelet), however the actual implimentation in the salt automation doesnt seem to exist. this change attempts to fix that for the vagrant usecase.
19 lines
751 B
Plaintext
19 lines
751 B
Plaintext
{% set grains_opts = grains.get('docker_opts', '') -%}
|
|
{% set e2e_opts = '' -%}
|
|
{% if pillar.get('e2e_storage_test_environment', '').lower() == 'true' -%}
|
|
{% set e2e_opts = '-s devicemapper' -%}
|
|
{% endif -%}
|
|
{% set bridge_opts = "--bridge=cbr0" %}
|
|
{% if pillar.get('network_provider', '').lower() == 'kubenet' %}
|
|
{% set bridge_opts = "" %}
|
|
{% endif -%}
|
|
{% if pillar.get('network_provider', '').lower() == 'cni' %}
|
|
{% set bridge_opts = "" %}
|
|
{% endif -%}
|
|
{% set log_level = "--log-level=warn" -%}
|
|
{% if pillar['docker_test_log_level'] is defined -%}
|
|
{% set log_level = pillar['docker_test_log_level'] -%}
|
|
{% endif -%}
|
|
DOCKER_OPTS="{{grains_opts}} {{e2e_opts}} {{bridge_opts}} --iptables=false --ip-masq=false {{log_level}}"
|
|
DOCKER_NOFILE=1000000
|