diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2019-01-19 00:02:36 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2019-01-19 00:02:36 +0100 |
| commit | ebf0833680ac4cadac699cd4c0a717a67146efcc (patch) | |
| tree | 5947a3ab95c5933a66c7cc8854aa5d1b372b6798 /common | |
| parent | added netplan config for elevate-office (diff) | |
docker role can now set the daemon config before it is installed
Diffstat (limited to 'common')
| -rw-r--r-- | common/kubernetes.yml | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/common/kubernetes.yml b/common/kubernetes.yml index 1ad583af..77a5c1ed 100644 --- a/common/kubernetes.yml +++ b/common/kubernetes.yml @@ -29,18 +29,17 @@ msg: "At least one net-index is < 1 (indizes start at 1)" failed_when: (kubernetes.net_index.values() | min) < 1 + - name: disable bridge and iptables in docker daemon config + set_fact: + docker_daemon_config: "{{ docker_daemon_config | default({}) | combine({'bridge': 'none', 'iptables': false}) }}" + ######## - name: install kubernetes and overlay network hosts: _kubernetes_nodes_ roles: - ## Since `base` has a dependency for docker it would install and start the daemon - ## without the docker daemon config file generated by `net`. - ## This means that the docker daemon will create a bridge and install iptables rules - ## upon first startup (the first time this playbook runs on a specific host). - ## Since it is a tedious task to remove the interface and the firewall rules it is much - ## easier to just run `net` before `base` as `net` does not need anything from `base`. - - role: kubernetes/net + - role: docker - role: kubernetes/base + - role: kubernetes/net - name: configure kubernetes master hosts: _kubernetes_masters_ |