From abf6c8b7b6dbd6e2dfd6bcf48f651dfea5fb2ea4 Mon Sep 17 00:00:00 2001
From: Pekka Helenius <pekka.helenius@fjordtek.com>
Date: Mon, 24 Jan 2022 14:46:47 +0200
Subject: [PATCH] Update CloudStack network configuration

---
 cloudstack/PKGBUILD         | 10 +++++++---
 cloudstack/cloudbr0.network |  4 ++--
 cloudstack/cloudbr1.network |  4 ++--
 cloudstack/cloudbr2.netdev  |  5 +++++
 cloudstack/cloudbr2.network |  9 +++++++++
 5 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 cloudstack/cloudbr2.netdev
 create mode 100644 cloudstack/cloudbr2.network

diff --git a/cloudstack/PKGBUILD b/cloudstack/PKGBUILD
index b1f6365..9ddd206 100644
--- a/cloudstack/PKGBUILD
+++ b/cloudstack/PKGBUILD
@@ -104,6 +104,8 @@ source=(
   "cloudbr0.network"
   "cloudbr1.netdev"
   "cloudbr1.network"
+  "cloudbr2.netdev"
+  "cloudbr2.network"
 )
 
 if [[ ${skip_tests} == "true" ]]; then
@@ -125,9 +127,11 @@ sha256sums=('SKIP'
             '2515da6f9195c7e3bce321bd328743ee4c685ccd01ddb4099202637036eab40e'
             '69b315a10f88c24d6fe2b248b0593691d656f8992e6e37f8b0a4d2d4a9caca40'
             '4d5d5c4d923ceec434403fc416a4d09a820fdb49ece6e4f6d0b32a05014446be'
-            'c12612ebca5c968c3648b858a1c23961963cf04d3a9f476400a0f3861952c7fd'
+            'e3be7fda05b639c1b82db854347262f8206639f78f13d5f207b52c9f6a126a8d'
             'dfc16a17e57b9d174aae8abee6c04b8a6b02ffc96909315f302199e43dea9b9e'
-            '49c7271d095eb7ba4d724edc615af99646bae4b7fa57ef6502e14ad452e6d602'
+            '2fa8cf39924356c5af6403f09ac17930b6d4f38c509cd655f36f705d1dc9d280'
+            '1bd92d5f69a49c03a492e96f03efdebcef88a73948410511b715339735e15d3f'
+            '0ce7c6173c80fa74de5a473336ab099337e9248cceef3b7b33c7199baf71aa33'
             'SKIP')
 
 pkgver() {
@@ -275,7 +279,7 @@ storage.scripts.dir=scripts/storage/qcow2
 
 public.network.device=cloudbr0
 private.network.device=cloudbr1
-#guest.network.device=
+guest.network.device=cloudbr2
 
 #ipv6disabled=true
 
diff --git a/cloudstack/cloudbr0.network b/cloudstack/cloudbr0.network
index df9a534..041a5c6 100644
--- a/cloudstack/cloudbr0.network
+++ b/cloudstack/cloudbr0.network
@@ -5,5 +5,5 @@ Name=cloudbr0
 ConfigureWithoutCarrier=yes
 
 [Address]
-Address=172.20.0.1/24
-Broadcast=172.20.0.255
+Address=10.70.0.1/16
+Broadcast=10.70.255.255
diff --git a/cloudstack/cloudbr1.network b/cloudstack/cloudbr1.network
index 9f5d587..4422948 100644
--- a/cloudstack/cloudbr1.network
+++ b/cloudstack/cloudbr1.network
@@ -5,5 +5,5 @@ Name=cloudbr1
 ConfigureWithoutCarrier=yes
 
 [Address]
-Address=172.20.1.1/24
-Broadcast=172.20.1.255
+Address=10.71.0.1/16
+Broadcast=10.71.255.255
diff --git a/cloudstack/cloudbr2.netdev b/cloudstack/cloudbr2.netdev
new file mode 100644
index 0000000..f46c6f5
--- /dev/null
+++ b/cloudstack/cloudbr2.netdev
@@ -0,0 +1,5 @@
+# Bridge interface for Apache CloudStack
+
+[NetDev]
+Name=cloudbr2
+Kind=bridge
diff --git a/cloudstack/cloudbr2.network b/cloudstack/cloudbr2.network
new file mode 100644
index 0000000..02cdcd1
--- /dev/null
+++ b/cloudstack/cloudbr2.network
@@ -0,0 +1,9 @@
+[Match]
+Name=cloudbr1
+
+[Network]
+ConfigureWithoutCarrier=yes
+
+[Address]
+Address=10.72.0.1/16
+Broadcast=10.72.255.255