From: Christian Pointner <equinox@spreadspace.org>
Date: Sun, 8 Jul 2018 11:50:46 +0000 (+0200)
Subject: Merge pull request #30 from realraum/global-network-config
X-Git-Url: https://git.realraum.at/?a=commitdiff_plain;h=71c67143bfd76cdb3666f6cd8199f9f993a0dbd4;hp=fae1230549884ec86913f77815bbacdf4b85b725;p=noc.git

Merge pull request #30 from realraum/global-network-config

ansible: global network config
---

diff --git a/ansible/group_vars/all/network.yml b/ansible/group_vars/all/network.yml
new file mode 100644
index 0000000..e5db8b2
--- /dev/null
+++ b/ansible/group_vars/all/network.yml
@@ -0,0 +1,54 @@
+---
+net:
+  mgmt:
+    vlan: 32
+    prefix: 192.168.32.0/24
+    gw: 192.168.32.254
+    dns:
+      - 192.168.32.254
+    offsets:
+      switches: 200
+      accesspoints: 220
+
+  iot:
+    vlan: 33
+    prefix: 192.168.33.0/24
+    gw: 192.168.33.1 ## TODO: should be 192.168.33.254, fix in reality and then change here
+    dns:
+      - 192.168.33.1
+
+  svc:
+    vlan: 34
+    prefix: 192.168.34.0/24
+    gw: 192.168.34.254
+    dns:
+      - 192.168.34.254
+
+  HAMNET:
+    vlan: 44
+
+  guests:
+    vlan: 127
+    prefix: 192.168.127.0/24
+    gw: 192.168.127.254
+    dns:
+      - 192.168.127.254
+
+  ## TODO: add 89.106.211.32/27...
+  members:
+    vlan: 128
+    prefix: 192.168.128.0/24
+    gw: 192.168.128.254
+    dns:
+      - 192.168.128.254
+
+  pub:
+    vlan: 130
+    prefix: 89.106.211.64/27
+    gw: 89.106.211.94
+    dns:
+      - 192.168.211.94
+
+  ff:
+    vlan: 255
+    prefix: 10.12.240.240/28
diff --git a/ansible/host_vars/alfred/main.yml b/ansible/host_vars/alfred/main.yml
index d01341b..5c0682a 100644
--- a/ansible/host_vars/alfred/main.yml
+++ b/ansible/host_vars/alfred/main.yml
@@ -17,11 +17,9 @@ vm_host:
       - i386
   network:
     interface: br-mgmt
-    ip: 192.168.32.65
-    mask: 255.255.255.0
-    gateway: 192.168.32.254
-    nameservers:
-    - 192.168.32.254
-    - 10.12.0.10
+    ip: "{{ net.mgmt.prefix | ipaddr(65) | ipaddr('address') }}"
+    mask: "{{ net.mgmt.prefix | ipaddr('netmask') }}"
+    gateway: "{{ net.mgmt.gw }}"
+    nameservers: "{{ net.mgmt.dns }}"
     indices:
       testvm: 99
diff --git a/ansible/host_vars/testvm/main.yml b/ansible/host_vars/testvm/main.yml
index 0709a22..80a95ad 100644
--- a/ansible/host_vars/testvm/main.yml
+++ b/ansible/host_vars/testvm/main.yml
@@ -17,8 +17,8 @@ vm_install:
   interfaces:
   - bridge: "{{ hostvars[vm_install_host].vm_host.network.interface }}"
     name: mgmt0
-  - bridge: "br-http"
-    name: http0
+  - bridge: "br-svc"
+    name: svc0
   autostart: True
 
 vm_network:
diff --git a/ansible/host_vars/torwaechter/main.yml b/ansible/host_vars/torwaechter/main.yml
index f50f8f9..926b903 100644
--- a/ansible/host_vars/torwaechter/main.yml
+++ b/ansible/host_vars/torwaechter/main.yml
@@ -100,15 +100,15 @@ openwrt_uci:
         ipaddr: 127.0.0.1
         netmask: 255.0.0.0
 
-    - name: interface 'lan'
+    - name: interface 'mgmt'
       options:
         ifname: eth0
         accept_ra: 0
         proto: static
-        ipaddr: 192.168.32.100
-        netmask: 255.255.255.0
-        gateway: 192.168.32.254
-        dns: 192.168.32.254
+        ipaddr: "{{ net.mgmt.prefix | ipaddr(100) | ipaddr('address') }}"
+        netmask: "{{ net.mgmt.prefix | ipaddr('netmask') }}"
+        gateway: "{{ net.mgmt.gw }}"
+        dns: "{{ net.mgmt.dns | join(' ') }}"
         dns_search: realraum.at