Added vars and vagrant config to create a test uplink node and prepared the map server in the vagrant file

Vagrantfile

@@ -4,14 +4,14 @@ Vagrant.configure("2") do |config|
   (1..N).each do |machine_id|
     config.vm.define "node0#{machine_id}" do |node|
       node.vm.box = "ARTACK/debian-jessie"
-      node.vm.hostname = "machine0#{machine_id}"
+      node.vm.hostname = "node0#{machine_id}"
       node.vm.network "private_network", ip: "192.168.77.#{20+machine_id}"
 
       node.vm.provider :virtualbox do |vb|
         vb.customize [
           "modifyvm", :id,
-          "--cpuexecutioncap", "50",
-          "--memory", "256",
+          "--cpuexecutioncap", "25",
+          "--memory", "128",
         ]
       end
 
@@ -24,4 +24,51 @@ Vagrant.configure("2") do |config|
       end
     end
   end
+
+  U = 1
+  (1..U).each do |machine_id|
+    config.vm.define "uplink0#{machine_id}" do |node|
+      node.vm.box = "ARTACK/debian-jessie"
+      node.vm.hostname = "uplink0#{machine_id}"
+      node.vm.network "private_network", ip: "192.168.77.#{30+machine_id}"
+
+      node.vm.provider :virtualbox do |vb|
+        vb.customize [
+          "modifyvm", :id,
+          "--cpuexecutioncap", "25",
+          "--memory", "128",
+        ]
+      end
+
+      node.vm.provision :ansible do |ansible|
+        ansible.playbook = "playbook.yml"
+
+        ansible.groups = {
+          "uplinks" => ["uplink01"]
+        }
+      end
+    end
+  end
+
+  config.vm.define "mapserver" do |node|
+    node.vm.box = "ARTACK/debian-jessie"
+    node.vm.hostname = "map"
+    node.vm.network "private_network", ip: "192.168.77.29"
+
+    node.vm.provider :virtualbox do |vb|
+      vb.customize [
+        "modifyvm", :id,
+        "--cpuexecutioncap", "25",
+        "--memory", "128",
+      ]
+    end
+
+    node.vm.provision :ansible do |ansible|
+      ansible.playbook = "playbook.yml"
+
+      ansible.groups = {
+        "uplinks" => ["uplink01"]
+      }
+    end
+  end
 end

group_vars/supernodes

@@ -16,6 +16,8 @@ supernodes:
     dhcp_range_start: 10.42.0.32
     dhcp_range_end: 10.42.5.254
     public_interface: eth1
+    uplink_tunnel_ip: 172.16.42.2/30
+    uplink_tunnel_ip_v6: fd30:db1d:2377:4143::2/64
   - name: node02
     public_ip: 192.168.77.22/24
     mesh_ip_v4: 10.42.0.16/16
@@ -25,6 +27,8 @@ supernodes:
     dhcp_range_start: 10.42.6.2
     dhcp_range_end: 10.42.8.254
     public_interface: eth1
+    uplink_tunnel_ip: 172.16.43.2/30
+    uplink_tunnel_ip_v6: fd30:db1d:2377:4144::2/64
 
 supernode_as: '65403'
 

group_vars/all/uplinks.yml

@@ -0,0 +1,9 @@
+uplinks:
+- name: uplink01
+  public_ip: 192.178.77.31/24
+  as: '65079'
+  public_interface: eth1
+  tunnel:
+  - tunnel_ip: 172.16.42.1/30
+    address_v6: fd30:db1d:2377:4143::1/64
+    supernode: "{{supernodes[0]}}"

host_vars/node01/supernode

@@ -21,14 +21,14 @@ supernode_other_nameserver: "{{supernode_mesh_backbones|map(attribute='mesh_ip')
 supernode_other_ntp_server: "{{supernode_mesh_backbones|map(attribute='mesh_ip')|map('ipaddr','address')|join(' ')}}"
 
 supernode_uplinks:
-  - name: uplink1
-    comment: Non existant uplink
-    address: 172.16.0.1
-    dstaddr: 172.16.0.2
-    netmask: 255.255.255.252
-    endpoint: 192.168.0.23
-    address_v6: fd0a:1c06:d97c:e88d::2/64
-    as: '65079'
+  - name: "{{uplinks[0].name}}"
+    comment: "{{uplinks[0].tunnel[0].comment|default('No comment')}}"
+    address: "{{local_node.uplink_tunnel_ip|ipaddr('address')}}"
+    dstaddr: "{{uplinks[0].tunnel[0].tunnel_ip|ipaddr('address')}}"
+    netmask: "{{uplinks[0].tunnel[0].tunnel_ip|ipaddr('netmask')}}"
+    endpoint: "{{uplinks[0].public_ip|ipaddr('address')}}"
+    address_v6: "{{local_node.uplink_tunnel_ip_v6}}"
+    as: "{{uplinks[0].as}}"
 
 supernode_interfaces:
   - name: eth0

host_vars/node02/supernode

@@ -20,16 +20,6 @@ supernode_mesh_backbones:
 supernode_other_nameserver: "{{supernode_mesh_backbones|map(attribute='mesh_ip')|map('ipaddr','address')|join(' ')}}"
 supernode_other_ntp_server: "{{supernode_mesh_backbones|map(attribute='mesh_ip')|map('ipaddr','address')|join(' ')}}"
 
-supernode_uplinks:
-  - name: uplink1
-    comment: Non existant uplink
-    address: 172.16.0.1
-    dstaddr: 172.16.0.2
-    netmask: 255.255.255.252
-    endpoint: 192.168.0.23
-    address_v6: fd0a:1c06:d97c:e88d::2/64
-    as: '65079'
-
 supernode_interfaces:
   - name: eth0
     auto: true

host_vars/uplink01/uplink.yml

@@ -0,0 +1,27 @@
+local_uplink: "{{uplinks[0]}}"
+
+uplink_gre_tunnel:
+- name: "{{local_uplink.tunnel[0].supernode.name}}"
+  local: "{{local_uplink.public_ip|ipaddr('address')}}"
+  endpoint: "{{local_uplink.tunnel[0].supernode.public_ip|ipaddr('address')}}"
+  netmask: "{{local_uplink.tunnel[0].tunnel_ip|ipaddr('netmask')}}"
+  address: "{{local_uplink.tunnel[0].tunnel_ip|ipaddr('address')}}"
+  dstaddr: "{{local_uplink.tunnel[0].supernode.uplink_tunnel_ip|ipaddr('address')}}"
+  address_v6: "{{local_uplink.tunnel[0].address_v6}}"
+
+uplink_interfaces:
+  - name: eth0
+    auto: true
+    proto: inet
+    type: dhcp
+  - name: eth1
+    auto: true
+    proto: inet
+    type: static
+    config:
+    - key: address
+      value: "{{local_uplink.public_ip|ipaddr('address')}}"
+    - key: netmask
+      value: "{{local_uplink.public_ip|ipaddr('netmask')}}"
+    - key: broadcast
+      value: "{{local_uplink.public_ip|ipaddr('broadcast')}}"

playbook.yml

@@ -1,4 +1,9 @@
 - hosts: supernodes
   sudo: yes
   roles:
-    - ff-supernode
+    - ff-supernode
+
+- hosts: uplinks
+  sudo: yes
+  roles:
+  - test-uplink

roles/test-uplink/README.md

@@ -0,0 +1,38 @@
+Role Name
+=========
+
+A brief description of the role goes here.
+
+Requirements
+------------
+
+Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required.
+
+Role Variables
+--------------
+
+A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well.
+
+Dependencies
+------------
+
+A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles.
+
+Example Playbook
+----------------
+
+Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
+
+    - hosts: servers
+      roles:
+         - { role: username.rolename, x: 42 }
+
+License
+-------
+
+BSD
+
+Author Information
+------------------
+
+An optional section for the role authors to include contact information, or a website (HTML is not allowed).

roles/test-uplink/defaults/main.yml

@@ -0,0 +1,2 @@
+---
+# defaults file for test-uplink

roles/test-uplink/handlers/main.yml

@@ -0,0 +1,4 @@
+---
+# handlers file for test-uplink
+- name: Restart network
+  shell: ifdown --exclude=lo --exclude="{{local_uplink.public_interface}}" -a && ifup --exclude=lo --exclude="{{local_uplink.public_interface}}" -a

roles/test-uplink/meta/main.yml

@@ -0,0 +1,14 @@
+---
+galaxy_info:
+  author: Till Klocke
+  description: Quick and dirty role to create a local uplink for test communities
+  company: Freifunk Dortmund
+  license: MIT
+  min_ansible_version: 1.2
+  platforms:
+  - name: Debian
+    versions:
+    - jessie
+  categories:
+  - networking
+dependencies: []

roles/test-uplink/tasks/main.yml

@@ -0,0 +1,12 @@
+---
+# tasks file for test-uplink
+
+- name: Install interfaces config
+  template: src=interfaces.j2 dest=/etc/network/interfaces
+  notify: Restart network
+
+- name: Install necessary packages
+  apt: name={{item}} state=present
+  with_items:
+  - bird
+  - openvpn

roles/test-uplink/templates/interfaces.j2

@@ -0,0 +1,49 @@
+# This file describes the network interfaces available on your system
+# and how to activate them. For more information, see interfaces(5).
+
+#
+# This file is generated by ansible
+#
+
+## Host Interfaces
+
+auto lo
+iface lo inet loopback
+
+{%for interface in uplink_interfaces %}
+{% if interface.auto is defined and interface.auto %}
+auto {{interface.name}}
+{% endif %}
+{% if interface.hotplug is defined and interface.hotplug %}
+allow-hotplug {{interface.name}}
+{% endif %}
+iface {{interface.name}} {{interface.proto}} {{interface.type}}
+{% if interface.config is defined %}
+{% for config in interface.config %}
+    {{config.key}} {{config.value}}
+{% endfor %}
+{% endif %}
+
+{% endfor %}
+
+{% if uplink_gre_tunnel is defined %}
+{% for tunnel in uplink_gre_tunnel %}
+{% if tunnel.comment is defined %}
+# {{tunnel.comment}}
+{% endif %}
+auto {{tunnel.name}}
+iface {{tunnel.name}} inet tunnel
+    mode gre
+    address {{tunnel.address}}
+    dstaddr {{tunnel.dstaddr}}
+    netmask {{tunnel.netmask}}
+    local {{tunnel.local|ipaddr('address')}}
+    endpoint {{tunnel.endpoint}}
+    mtu 1400
+    ttl 64
+
+iface {{tunnel.name}} inet6 static
+    address {{tunnel.address_v6}}
+
+{% endfor %}
+{% endif %}

roles/test-uplink/vars/main.yml

@@ -0,0 +1,2 @@
+---
+# vars file for test-uplink