Skip to content

Commit b07db69

Browse files
committed
Merge pull request #4721 from aledbf/start-flannel
fix(user-data): always start flannel on boot
2 parents d9ef023 + 454dfb0 commit b07db69

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

contrib/coreos/user-data.example

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,12 @@ coreos:
4848
[Service]
4949
Environment="DOCKER_OPTS=--insecure-registry 10.0.0.0/8 --insecure-registry 172.16.0.0/12 --insecure-registry 192.168.0.0/16 --insecure-registry 100.64.0.0/10"
5050
- name: flanneld.service
51+
command: start
5152
drop-ins:
5253
- name: 50-network-config.conf
5354
content: |
5455
[Service]
55-
ExecStartPre=/usr/bin/etcdctl mk /coreos.com/network/config '{"Network": "10.244.0.0/16", "SubnetLen": 24, "SubnetMin": "10.244.0.0", "Backend": {"Type": "vxlan"}}'
56+
ExecStartPre=-/usr/bin/etcdctl mk /coreos.com/network/config '{"Network": "10.244.0.0/16", "SubnetLen": 24, "SubnetMin": "10.244.0.0", "Backend": {"Type": "vxlan"}}'
5657
- name: graceful-deis-shutdown.service
5758
content: |
5859
[Unit]

0 commit comments

Comments
 (0)