Adding saml2 support

Fixing below error by adding proper pkg $ ceph dashboard sso show saml2 Error EPERM: Required library not found: `python3-saml` Closes #57 Signed-off-by: Seyeong Kim <[email protected]>
canonical · Aug 21, 2024 · ce91ec0 · ce91ec0
1 parent 74c30f7
commit ce91ec0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml
@@ -175,7 +175,8 @@ jobs:
       - name: use local disk and create partitions for osds
         run: |
           cd rook
-          ./tests/scripts/github-action-helper.sh use_local_disk
+          #./tests/scripts/github-action-helper.sh use_local_disk
+          ../test/scripts/cephadm_helper.sh use_local_disk
           ./tests/scripts/github-action-helper.sh create_partitions_for_osds
 
       - name: Download artifact

diff --git a/rockcraft.yaml b/rockcraft.yaml
@@ -71,6 +71,7 @@ parts:
             - python3-natsort
             - sharutils
             - lsof
+            - python3-onelogin-saml2
 
     kubectl:
         plugin: go

diff --git a/scripts/deploy-helper.sh b/scripts/deploy-helper.sh
@@ -40,7 +40,7 @@ function deploy_cluster_with_custom_image() {
 }
 
 function deploy_cluster() {
-  local operator_default="rook/ceph:v1.12.0"
+  local operator_default="rook/ceph:v1.15.0"
   local operator_img=${1:-"$operator_default"}
   local cluster_default="$( cat custom-image-spec )"
   local cluster_img=${2:-"$cluster_default"}

diff --git a/test/scripts/cephadm_helper.sh b/test/scripts/cephadm_helper.sh
@@ -16,7 +16,7 @@ function prep_docker() {
 
 function use_local_disk() {
     sudo lsblk -f
-    datadisk=$(sudo lsblk --paths | awk '/14G/ || /64G/ {print $1}' | head -1)
+    datadisk=$(sudo lsblk --paths | awk '/15.3G/ || /65.5G/ {print $1}' | head -1)
     sudo apt purge snapd -y
     sudo dmsetup version || true
     sudo swapoff --all --verbose
@@ -88,4 +88,4 @@ function test_num_objs() {
 
 FUNCTION="$1"
 shift
-$FUNCTION "$@"
+$FUNCTION "$@"