External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-05-07 01:17:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Split deploy steps in separate playbooks: part1 (#3451)

Browse Source 
* Fix bootstrap_os/ubuntu idempotency

* Update bastion role

* move container_engine in sub-roles

* requires ansible 2.5

* ubuntu18 as first CI job
This commit is contained in:
Antoine Legrand
2018-10-10 04:14:33 +02:00
committed by k8s-ci-robot
parent 2ab2f3a0a3
commit c27a91f7f0
55 changed files with 109 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
roles/container-engine/docker/templates/docker-options.conf.j2 Normal file
View File

@@ -0,0 +1,5 @@
[Service]
Environment="DOCKER_OPTS={{ docker_options|default('') }} --iptables={{ docker_iptables_enabled | default('false') }}"
{% if docker_mount_flags is defined and docker_mount_flags != "" %}
MountFlags={{ docker_mount_flags }}
{% endif %}