From 0d98dcb11c0769c631fed1af18adbfa9fc941817 Mon Sep 17 00:00:00 2001
From: ashrod98 <ashrod98@gmail.com>
Date: Wed, 14 Feb 2024 21:13:04 +0000
Subject: [PATCH] Fix stable CI

cephfs-nfs failing in stable/2023.1 because of missing packages.
Add cephfs-nfs-cephadm test

Change-Id: Ib4bbe4e9ab43513d91ba8fc7ddff70ffb8ae9d8f
---
 .zuul.yaml                               | 9 ++++++++-
 devstack/files/rpms/devstack-plugin-ceph | 2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 9fe196d2..f4001925 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -75,7 +75,7 @@
     description: |
       Runs manila tempest plugin tests with Native CephFS as a manila back
       end (DHSS=False)
-    parent: manila-tempest-plugin-cephfs-native
+    parent: manila-tempest-plugin-cephfs-native-cephadm
 
 - job:
     name: devstack-plugin-ceph-cephfs-nfs
@@ -83,6 +83,12 @@
       Runs manila tempest plugin tests with CephFS via NFS-Ganesha as a manila
       back end (DHSS=False)
     parent: manila-tempest-plugin-cephfs-nfs
+    nodeset: openstack-single-node-jammy
+
+- job:
+    name: devstack-plugin-ceph-multinode-cephfs-nfs-cephadm
+    parent: manila-tempest-plugin-multinode-cephfs-nfs-cephadm
+    description: Test CephFS NFS (DHSS=False) in a Multinode devstack env
 
 - job:
     name: devstack-plugin-ceph-multinode-tempest-py3
@@ -147,6 +153,7 @@
         - devstack-plugin-ceph-tempest-cephadm:
             voting: false
         - devstack-plugin-ceph-multinode-tempest-py3
+        - devstack-plugin-ceph-multinode-cephfs-nfs-cephadm
         - devstack-plugin-ceph-cephfs-native:
             irrelevant-files: *irrelevant-files
             voting: false
diff --git a/devstack/files/rpms/devstack-plugin-ceph b/devstack/files/rpms/devstack-plugin-ceph
index 1b806da7..f1db2b60 100644
--- a/devstack/files/rpms/devstack-plugin-ceph
+++ b/devstack/files/rpms/devstack-plugin-ceph
@@ -3,3 +3,5 @@ dbus-tools
 podman
 jq
 ceph-common
+ceph-mon
+ceph-osd