From c1768cd96c401b8216d27c810bfb410a273a4291 Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Mar 26 2024 21:58:52 +0000
Subject: Merge branch 'crameleon/zypp-memory' into 'production'


Raise minimum memory to 1G

See merge request infra/salt!1610
---

diff --git a/pillar/infra/README.md b/pillar/infra/README.md
index 10b9058..f69da91 100644
--- a/pillar/infra/README.md
+++ b/pillar/infra/README.md
@@ -11,7 +11,7 @@ Example, values enclosed in `< >` are to be substituted:
 ```
 <hostname>:                       # short hostname, will turn into <hostname>.infra.opensuse.org
   cluster: <cluster>              # hypervisor cluster, needs to exist in clusters.yaml
-  ram: 1024MB                     # memory, currently requires MB for min/max calculations (minimum should be 768MB)
+  ram: 1024MB                     # memory, currently requires MB for min/max calculations (minimum should be 1024MB)
   vcpu: 1                         # CPU cores
 
   interfaces:
diff --git a/pillar/infra/hosts.yaml b/pillar/infra/hosts.yaml
index 6c97f6b..c74e85b 100644
--- a/pillar/infra/hosts.yaml
+++ b/pillar/infra/hosts.yaml
@@ -149,7 +149,7 @@ devcon:
       mac: 1a:eb:8a:3d:1a:82
       source: x-s-na-mgmt
   primary_interface: os-internal
-  ram: 768MB
+  ram: 1024MB
   vcpu: 1
 discourse01:
   cluster: falkor
@@ -956,7 +956,7 @@ warp:
       mac: d6:f7:c1:31:ce:81
       source: x-s-j-os-out
   primary_interface: os-s-warp
-  ram: 768MB
+  ram: 1024MB
   vcpu: 1
 water:
   cluster: falkor