change docker v6 style

_modules/net_utils.py

+# -*- coding: utf-8 -*-
+import logging
+from ipaddress import ip_network
+
+__virtualname__ = 'net_utils'
+
+def __virtual__():
+    return __virtualname__
+
+def gateway(ip_range):
+    return str(ip_network(ip_range)[1])

bird/files/docker6.conf.j2

 function is_docker() {
 	return net ~ [
-		{{ prefix }}
+		{%- for net in prefix.values() %}
+		{{ net }}{% if not loop.last %},{% endif %}
+		{%- endfor %}
 	];
 }
 
@@ -13,5 +15,5 @@ filter f_docker {
 
 protocol direct d_docker {
 	import filter f_docker;
-	interface "docker0";
+	interface "docker0", "br-*";
 }

docker/files/ferm.conf.j2

@@ -54,6 +54,9 @@ domain ip6 {
             interface docker0 ACCEPT;
             outerface docker0 mod state state (ESTABLISHED RELATED) ACCEPT;
             outerface docker0 DROP;
+            interface br-+ ACCEPT;
+            outerface br-+ mod state state (ESTABLISHED RELATED) ACCEPT;
+            outerface br-+ DROP;
         }
     }
 }

docker/init.sls

@@ -62,7 +62,7 @@ docker-volume-root:
         ExecStart=
         ExecStart=/usr/bin/dockerd -H fd:// --experimental \
                   --storage-driver={{ docker.storagedriver | default('overlay2') }}{% if docker.get('ipv6') %} \
-                  --ipv6 --fixed-cidr-v6 {{ docker.ipv6 }}{%- endif %}
+                  --ipv6 --fixed-cidr-v6 {{ docker.ipv6.default }}{%- endif %}
     - require:
       - pkg: docker
 

grafana/files/docker-compose.yml.j2

-version: '2'
+version: '2.4'
 
 services:
   grafana:
@@ -9,6 +9,7 @@ services:
     networks:
       - proxy
       - grafana
+      - renderer
     volumes:
       - {{ data_dir }}:/var/lib/grafana
       - {{ provisioning_dir }}:/etc/grafana/provisioning
@@ -39,13 +40,18 @@ services:
     image: grafana/grafana-image-renderer:latest
     hostname: renderer
     restart: always
-    mem_limit: 2G
+    mem_limit: 10G
     networks:
-      - grafana
-    ports:
-      - 8081
+      - renderer
 
 networks:
   proxy:
     external: true
+  renderer:
   grafana:
+    enable_ipv6: true
+    ipam:
+      driver: default
+      config:
+        - subnet: {{ grafana_prefix_v6 }}
+          gateway: {{ salt['net_utils.gateway'](grafana_prefix_v6) }}

grafana/grafana.sls

@@ -91,6 +91,7 @@ grafana-net-proxy:
       plugins: "{{ plugins|join(',') }}"
       frontend: "{{ grafana.get('frontend', '') }}"
       image_tag: "{{ image_tag }}"
+      grafana_prefix_v6: {{ docker.ipv6.grafana }}
     - require:
       - docker_image: docker-image-grafana/grafana:{{ image_tag }}
       - docker_image: docker-image-grafana-renderer/grafana/grafana-image-renderer:latest