From 750d2d9afbff5238bc766fb87ec5bdb288141936 Mon Sep 17 00:00:00 2001
From: Andy Wu <andy.wu@canonical.com>
Date: Tue, 6 Aug 2024 15:44:41 -0600
Subject: [PATCH 1/2] Add cinder-nfs charm

---
 charmed_openstack_info/data/lp-builder-config/openstack.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/charmed_openstack_info/data/lp-builder-config/openstack.yaml b/charmed_openstack_info/data/lp-builder-config/openstack.yaml
index b282e55..6bc2234 100644
--- a/charmed_openstack_info/data/lp-builder-config/openstack.yaml
+++ b/charmed_openstack_info/data/lp-builder-config/openstack.yaml
@@ -997,6 +997,11 @@ projects:
     launchpad: charm-cinder-lvm
     repository: https://opendev.org/openstack/charm-cinder-lvm.git
 
+  - name: OpenStack Cinder NFS Charm
+    charmhub: cinder-nfs
+    launchpad: charm-cinder-nfs
+    repository: https://opendev.org/openstack/charm-cinder-nfs.git
+
   - name: OpenStack Cinder Nimblestorage Charm
     charmhub: cinder-nimblestorage
     launchpad: charm-cinder-nimblestorage

From e7f0919453c8906e896838a5aaec5f4a710e3669 Mon Sep 17 00:00:00 2001
From: Andy Wu <andy.wu@canonical.com>
Date: Thu, 8 Aug 2024 10:34:42 -0600
Subject: [PATCH 2/2] Add branch override for cinder-nfs charm

---
 .../data/lp-builder-config/openstack.yaml     | 81 +++++++++++++++++++
 1 file changed, 81 insertions(+)

diff --git a/charmed_openstack_info/data/lp-builder-config/openstack.yaml b/charmed_openstack_info/data/lp-builder-config/openstack.yaml
index 6bc2234..3f78640 100644
--- a/charmed_openstack_info/data/lp-builder-config/openstack.yaml
+++ b/charmed_openstack_info/data/lp-builder-config/openstack.yaml
@@ -1001,6 +1001,87 @@ projects:
     charmhub: cinder-nfs
     launchpad: charm-cinder-nfs
     repository: https://opendev.org/openstack/charm-cinder-nfs.git
+    branches:
+      master:
+        enabled: True
+        build-channels:
+          charmcraft: "2.x/candidate"
+        channels:
+          - latest/edge
+        bases:
+          - "20.04"
+          - "22.04"
+          - "23.04"
+          - "23.10"
+      stable/ussuri:
+        enabled: True
+        build-channels:
+          charmcraft: "1.5/stable"
+        channels:
+          - ussuri/stable
+        bases:
+          - "20.04"
+      stable/victoria:
+        enabled: True
+        build-channels:
+          charmcraft: "1.5/stable"
+        channels:
+          - victoria/stable
+        bases:
+          - "20.04"
+      stable/wallaby:
+        enabled: True
+        build-channels:
+          charmcraft: "1.5/stable"
+        channels:
+          - wallaby/stable
+        bases:
+          - "20.04"
+      stable/xena:
+        enabled: True
+        build-channels:
+          charmcraft: "1.5/stable"
+        channels:
+          - xena/stable
+        bases:
+          - "20.04"
+      stable/yoga:
+        enabled: True
+        build-channels:
+          charmcraft: "1.5/stable"
+        channels:
+          - yoga/stable
+        bases:
+          - "20.04"
+          - "22.04"
+      stable/zed:
+        enabled: True
+        build-channels:
+          charmcraft: "2.1/stable"
+        channels:
+          - zed/stable
+        bases:
+          - "22.04"
+          - "22.10"
+      stable/2023.1:
+        enabled: True
+        build-channels:
+          charmcraft: "2.1/stable"
+        channels:
+          - 2023.1/stable
+        bases:
+          - "22.04"
+          - "23.04"
+      stable/2023.2:
+        enabled: True
+        build-channels:
+          charmcraft: "2.x/candidate"
+        channels:
+          - 2023.2/stable
+        bases:
+          - "22.04"
+          - "23.10"
+      stable/2024.1:
 
   - name: OpenStack Cinder Nimblestorage Charm
     charmhub: cinder-nimblestorage