lib/kontena/machine/azure/cloudinit.yml in kontena-plugin-azure-0.2.5 vs lib/kontena/machine/azure/cloudinit.yml in kontena-plugin-azure-0.3.0
- old
+ new
@@ -4,11 +4,11 @@
permissions: 0600
owner: root
content: |
KONTENA_URI="<%= master_uri %>"
KONTENA_TOKEN="<%= grid_token %>"
- KONTENA_PEER_INTERFACE=eth1
+ KONTENA_PEER_INTERFACE=eth0
KONTENA_VERSION=<%= version %>
- path: /etc/systemd/system/docker.service.d/50-kontena.conf
content: |
[Service]
Environment='DOCKER_OPTS=--insecure-registry="10.81.0.0/16" --bip="172.17.43.1/16"'
@@ -35,18 +35,25 @@
After=docker.service
[Service]
Restart=always
RestartSec=5
ExecStart=/usr/bin/docker logs --tail=10 -f kontena-etcd
- - name: 10-weave.network
+ - name: 50-docker.network
+ mask: true
+ - name: 50-docker-veth.network
+ mask: true
+ - name: zz-default.network
runtime: false
content: |
+ # default should only match real network interfaces
[Match]
- Type=bridge
- Name=weave*
-
+ Name=eth*
[Network]
+ DHCP=yes
+ [DHCP]
+ UseMTU=true
+ UseDomains=true
- name: kontena-agent.service
command: start
enable: true
content: |
[Unit]
@@ -60,10 +67,11 @@
[Service]
Restart=always
RestartSec=5
EnvironmentFile=/etc/kontena-agent.env
+ EnvironmentFile=-/etc/kontena-agent.custom.env
ExecStartPre=-/usr/bin/docker stop kontena-agent
ExecStartPre=-/usr/bin/docker rm kontena-agent
ExecStartPre=/usr/bin/docker pull kontena/agent:${KONTENA_VERSION}
ExecStart=/usr/bin/docker run --name kontena-agent \
-e KONTENA_URI=${KONTENA_URI} \
@@ -71,5 +79,6 @@
-e KONTENA_PEER_INTERFACE=${KONTENA_PEER_INTERFACE} \
-v=/var/run/docker.sock:/var/run/docker.sock \
-v=/etc/kontena-agent.env:/etc/kontena.env \
--net=host \
kontena/agent:${KONTENA_VERSION}
+ ExecStop=/usr/bin/docker stop kontena-agent