From 122835c39d3a6115e43e78879b73805db54a660a Mon Sep 17 00:00:00 2001
From: Hazel <hrandquist@osc.edu>
Date: Wed, 29 Nov 2023 12:52:37 -0500
Subject: [PATCH] =?UTF-8?q?Revert=20"Changes=20default=20return=20value=20?=
 =?UTF-8?q?for=20cluster.batch=5Fconnect=5Fssh=5Fal=E2=80=A6=20(#820)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Revert "Changes default return value for cluster.batch_connect_ssh_allow? (#818)"

This reverts commit 6504b5f3fc175d9dec496905c4b8ce945db49149.

* Updates changelog & version for next release
---
 CHANGELOG.md            | 4 ++++
 lib/ood_core/cluster.rb | 4 ++--
 lib/ood_core/version.rb | 2 +-
 spec/cluster_spec.rb    | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00a5d3c29..1f14b7a50 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.24.1] - 11-29-2023
+
+[820](https://github.com/OSC/ood_core/pull/820) Reverts [818](https://github.com/OSC/ood_core/pull/818)
+
 ## [0.24.0] - 11-28-2023
 
 - Code cleanup and separate arguments with whitespace in Fujitsu TCS adapter by @mnakao in https://github.com/OSC/ood_core/pull/808
diff --git a/lib/ood_core/cluster.rb b/lib/ood_core/cluster.rb
index 9d7a6ceae..7ac212f37 100644
--- a/lib/ood_core/cluster.rb
+++ b/lib/ood_core/cluster.rb
@@ -165,9 +165,9 @@ def allow?
     # @return [Boolean, nil] whether cluster supports SSH to batch connect node
     def batch_connect_ssh_allow?
       return @batch_connect_ssh_allow if defined?(@batch_connect_ssh_allow)
-      return @batch_connect_ssh_allow = true if batch_connect_config.nil?
+      return @batch_connect_ssh_allow = nil if batch_connect_config.nil?
 
-      @batch_connect_ssh_allow = batch_connect_config.fetch(:ssh_allow, true)
+      @batch_connect_ssh_allow = batch_connect_config.fetch(:ssh_allow, nil)
     end
 
     # The comparison operator
diff --git a/lib/ood_core/version.rb b/lib/ood_core/version.rb
index 784537d0b..5b6219446 100644
--- a/lib/ood_core/version.rb
+++ b/lib/ood_core/version.rb
@@ -1,4 +1,4 @@
 module OodCore
   # The current version of {OodCore}
-  VERSION = "0.24.0"
+  VERSION = "0.24.1"
 end
diff --git a/spec/cluster_spec.rb b/spec/cluster_spec.rb
index 0050cf678..2f30f1fef 100644
--- a/spec/cluster_spec.rb
+++ b/spec/cluster_spec.rb
@@ -53,7 +53,7 @@
       end
 
       it 'has default for batch_connect_ssh_allow?' do
-        expect(owens.batch_connect_ssh_allow?).to be true
+        expect(owens.batch_connect_ssh_allow?).to be_nil
       end
 
       it 'can enable batch_connect_ssh_allow?' do