ch-gw-lan re-deployed @ ch-phoebe

3 files changed, 19 insertions, 59 deletions

diff --git a/inventory/host_vars/ch-router.yml b/inventory/host_vars/ch-router.yml
index 367ec6cd..5fecdba8 100644
--- a/inventory/host_vars/ch-router.yml
+++ b/inventory/host_vars/ch-router.yml
@@ -1,10 +1,26 @@
 ---
+install:
+  vm:
+    memory: 128M
+    numcpus: 2
+    autostart: false
+  disks:
+    primary: /dev/sda
+    scsi:
+      sda:
+        type: image
+        path: /srv/nvme/ch-router/root.img
+  interfaces:
+  - bridge: br-svc
+  - bridge: br-magenta
+  - bridge: br-mgmt
+
+
 openwrt_arch: x86
 openwrt_target: 64
 openwrt_profile: generic
 openwrt_output_image_suffixes:
-  - "{{ openwrt_profile }}-ext4-rootfs.img.gz"
-  - "{{ openwrt_profile }}-kernel.bin"
+  - "{{ openwrt_profile }}-ext4-combined.img.gz"
 
 openwrt_packages_remove:
   - ppp
@@ -325,60 +341,6 @@ openwrt_uci:
         overhead: '18 mpu 64 noatm'
 
 
-virsh_domxml: |
-  <domain type='kvm'>
-    <name>ch-router</name>
-    <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>
-      <acpi/>
-      <apic/>
-      <pae/>
-    </features>
-    <clock offset='utc'/>
-    <on_poweroff>destroy</on_poweroff>
-    <on_reboot>restart</on_reboot>
-    <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='/srv/ch-router/rootfs-ext4.img'/>
-        <target dev='sda' bus='virtio'/>
-      </disk>
-      <interface type='bridge'>
-        <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>
-    </devices>
-  </domain>
-
-
 prometheus_scrape_endpoint: "{{ network_zones.mgmt.prefix | ipaddr(network_zones.mgmt.offsets[inventory_hostname]) | ipaddr('address') }}:9100"
 prometheus_exporters_default:
   - openwrt
diff --git a/inventory/host_vars/ch-testvm-openwrt.yml b/inventory/host_vars/ch-testvm-openwrt.yml
index d19466ac..5e5ebb4c 100644
--- a/inventory/host_vars/ch-testvm-openwrt.yml
+++ b/inventory/host_vars/ch-testvm-openwrt.yml
@@ -12,7 +12,6 @@ install:
         path: /srv/nvme/ch-testvm-openwrt/root.img
   interfaces:
   - bridge: br-svc
-    name: svc0
 
 
 openwrt_arch: x86
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index 3d12705b..6802f77c 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -345,7 +345,6 @@ ele-gwhetzner
 
 ## virtualization
 [vmhost-ch-gnocchi-guests]
-ch-router
 ch-nic
 [vmhost-ch-gnocchi]
 ch-gnocchi
@@ -355,7 +354,7 @@ vmhost-ch-gnocchi-guests
 [vmhost-ch-phoebe-guests]
 ch-testvm-phoebe
 ch-testvm-openwrt
-#ch-router
+ch-router
 ch-router-obsd
 ch-jump
 ch-gw-lan