From 56d6196431e31335eaab4d1efb53137be472242b Mon Sep 17 00:00:00 2001
From: nazunalika <tucklesepk@gmail.com>
Date: Sat, 1 May 2021 09:33:32 -0700
Subject: [PATCH] re-add resilient storage

---
 r8.conf      |  6 ++++--
 variants.xml | 13 +++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/r8.conf b/r8.conf
index b4db302..2514450 100644
--- a/r8.conf
+++ b/r8.conf
@@ -103,7 +103,7 @@ lorax_options = [
 ]
 
 buildinstall_skip = [
-    ("^(AppStream|PowerTools|HighAvailability)$", {
+    ("^(AppStream|PowerTools|HighAvailability|ResilientStorage)$", {
        "*": True
        }),
 ]
@@ -120,7 +120,7 @@ image_volid_formats = [ '{release_short}-8.3-{arch}-{disc_type}', ]
 create_optional_isos = False
 
 createiso_skip = [
-    ('^(BaseOS|AppStream|Minimal|PowerTools|HighAvailability)$', {
+    ('^(BaseOS|AppStream|Minimal|PowerTools|HighAvailability|ResilientStorage)$', {
         '*': True,
         'src':True
     }),
@@ -149,6 +149,8 @@ variant_as_lookaside = [
     ('PowerTools', 'AppStream'),
     ('HighAvailability', 'BaseOS'),
     ('HighAvailability', 'AppStream'),
+    ("ResilientStorage", "BaseOS"),
+    ("ResilientStorage", "AppStream"),
 ]
 
 extra_files = [
diff --git a/variants.xml b/variants.xml
index e8897c5..6d3b6a8 100644
--- a/variants.xml
+++ b/variants.xml
@@ -256,6 +256,19 @@
 
   <!-- ADDONS (Defined as variants in RHEL-8) -->
 
+  <variant id="ResilientStorage" name="Resilient Storage" type="variant">
+    <arches>
+      <arch>x86_64</arch>
+      <arch>ppc64le</arch>
+      <arch>aarch64</arch>
+    </arches>
+    <groups>
+      <group default="true">ha</group>
+      <group default="true">ha-devel</group>
+      <group default="true">resilient-storage</group>
+    </groups>
+  </variant>
+
   <variant id="HighAvailability" name="High Availability" type="variant">
     <arches>
       <arch>aarch64</arch>