From 34070cb609983c4bbc2128435e7d41d3ef49723e Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Tue, 2 Jul 2019 02:53:52 +0200
Subject: basic ch-router deployment is done now

---
 inventory/host_vars/ch-router.yml | 60 +++++++++++++++++++++++++++++++--------
 1 file changed, 48 insertions(+), 12 deletions(-)

(limited to 'inventory/host_vars/ch-router.yml')

diff --git a/inventory/host_vars/ch-router.yml b/inventory/host_vars/ch-router.yml
index b0aa778e..b2b49063 100644
--- a/inventory/host_vars/ch-router.yml
+++ b/inventory/host_vars/ch-router.yml
@@ -5,7 +5,8 @@ openwrt_arch: x86
 openwrt_target: 64
 openwrt_profile: Generic
 openwrt_output_image_suffixes:
-  - "combined-ext4.img.gz"
+  - "rootfs-ext4.img.gz"
+  - "vmlinuz"
 
 openwrt_packages_remove:
   - ppp
@@ -15,7 +16,7 @@ openwrt_packages_remove:
   - odhcpd
   - odhcpd-ipv6only
 openwrt_packages_add:
-  - haveged
+  - rng-tools
   - htop
   - ip
   - less
@@ -51,10 +52,15 @@ openwrt_uci:
         enabled: '1'
         enable_server: '0'
         server:
-          - '0.lede.pool.ntp.org'
-          - '1.lede.pool.ntp.org'
-          - '2.lede.pool.ntp.org'
-          - '3.lede.pool.ntp.org'
+          - '0.at.pool.ntp.org'
+          - '1.at.pool.ntp.org'
+          - '2.at.pool.ntp.org'
+          - '3.at.pool.ntp.org'
+
+    - name: rngd
+      options:
+        enabled: '1'
+        device: '/dev/hwrng'
 
   dropbear:
     - name: dropbear
@@ -75,20 +81,36 @@ openwrt_uci:
         ipaddr: 127.0.0.1
         netmask: 255.0.0.0
 
+    - name: interface 'svc'
+      options:
+        ifname: eth0
+        proto: static
+        ipaddr: "{{ network_zones.svc.prefix | ipaddr(network_zones.svc.offsets[inventory_hostname]) | ipaddr('address') }}"
+        netmask: "{{ network_zones.svc.prefix | ipaddr('netmask') }}"
+
     - name: interface 'magenta'
       options:
-        ifname: eth
+        ifname: eth1
         proto: dhcp
 
+    - name: interface 'mgmt'
+      options:
+        ifname: eth2
+        proto: static
+        ipaddr: "{{ network_zones.mgmt.prefix | ipaddr(network_zones.mgmt.offsets[inventory_hostname]) | ipaddr('address') }}"
+        netmask: "{{ network_zones.mgmt.prefix | ipaddr('netmask') }}"
+
 
 virsh_domxml: |
   <domain type='kvm'>
     <name>router</name>
-    <memory>65536</memory>
-    <currentMemory>65536</currentMemory>
-    <vcpu>1</vcpu>
+    <memory>131072</memory>
+    <currentMemory>131072</currentMemory>
+    <vcpu>2</vcpu>
     <os>
       <type arch='x86_64' machine='pc-0.12'>hvm</type>
+      <kernel>/srv/ch-router/vmlinuz</kernel>
+      <cmdline>console=ttyS0,115200n8 noinitrd root=/dev/vda</cmdline>
       <boot dev='hd'/>
     </os>
     <features>
@@ -102,16 +124,30 @@ virsh_domxml: |
     <on_crash>restart</on_crash>
     <devices>
       <emulator>/usr/bin/kvm</emulator>
+      <rng model='virtio'>
+        <!-- <rate period="2000" bytes="204800"/> -->
+        <backend model='random'>/dev/random</backend>
+      </rng>
       <disk type='file' device='disk'>
         <driver name='qemu' type='raw' cache='none'/>
-        <source file='/tmp/openwrt-18.06.2-x86-64-combined-ext4.img'/>
+        <source file='/srv/ch-router/rootfs-ext4.img'/>
         <target dev='sda' bus='virtio'/>
       </disk>
       <interface type='bridge'>
-        <source bridge='br-magenta'/>
+        <source bridge='br-svc'/>
         <model type='virtio'/>
         <address type='pci' domain='0x0000' bus='0x01' slot='0x01' function='0x0'/>
       </interface>
+      <interface type='bridge'>
+        <source bridge='br-magenta'/>
+        <model type='virtio'/>
+        <address type='pci' domain='0x0000' bus='0x01' slot='0x02' function='0x0'/>
+      </interface>
+      <interface type='bridge'>
+        <source bridge='br-mgmt'/>
+        <model type='virtio'/>
+        <address type='pci' domain='0x0000' bus='0x01' slot='0x03' function='0x0'/>
+      </interface>
       <console type='pty'>
         <target type='serial' port='0'/>
       </console>
-- 
cgit v1.2.3