From 3469955cac067aad4ee43a6172ef36909960b892 Mon Sep 17 00:00:00 2001
From: James Slagle <jslagle@redhat.com>
Date: Wed, 31 Oct 2018 09:05:18 -0400
Subject: [PATCH] Make $SSH_OPTIONS overrideable

In some cases, it may be desireable to override $SSH_OPTIONS as used by
the deployed-server get-occ-config.sh script. Particularly in
environments that wish to remove -tt.

This patches makes it so that the value can be overridden via the shell.

Change-Id: I14ab6765b3e55f602bb8ae56a313fce9812e3f59
Closes-Bug: #1800834
(cherry picked from commit 30741a22d70c01e81eed6c7503bf5c04919d856f)
---
 deployed-server/scripts/get-occ-config.sh                     | 2 +-
 .../notes/overrideable-ssh-options-1bd4a78408eb6c2c.yaml      | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/overrideable-ssh-options-1bd4a78408eb6c2c.yaml

diff --git a/deployed-server/scripts/get-occ-config.sh b/deployed-server/scripts/get-occ-config.sh
index 634889600d..ad6739b100 100755
--- a/deployed-server/scripts/get-occ-config.sh
+++ b/deployed-server/scripts/get-occ-config.sh
@@ -10,7 +10,7 @@ BLOCKSTORAGE_HOSTS=${BLOCKSTORAGE_HOSTS:-""}
 OBJECTSTORAGE_HOSTS=${OBJECTSTORAGE_HOSTS:-""}
 CEPHSTORAGE_HOSTS=${CEPHSTORAGE_HOSTS:-""}
 SUBNODES_SSH_KEY=${SUBNODES_SSH_KEY:-"~/.ssh/id_rsa"}
-SSH_OPTIONS="-tt -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=Verbose -o PasswordAuthentication=no -o ConnectionAttempts=32"
+SSH_OPTIONS=${SSH_OPTIONS:-"-tt -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=Verbose -o PasswordAuthentication=no -o ConnectionAttempts=32"}
 OVERCLOUD_ROLES=${OVERCLOUD_ROLES:-"Controller Compute BlockStorage ObjectStorage CephStorage"}
 STACK_NAME=${STACK_NAME:-"overcloud"}
 
diff --git a/releasenotes/notes/overrideable-ssh-options-1bd4a78408eb6c2c.yaml b/releasenotes/notes/overrideable-ssh-options-1bd4a78408eb6c2c.yaml
new file mode 100644
index 0000000000..9b1d02dfff
--- /dev/null
+++ b/releasenotes/notes/overrideable-ssh-options-1bd4a78408eb6c2c.yaml
@@ -0,0 +1,4 @@
+---
+fixes:
+  - The deployed-server get-occ-config.sh script now allows $SSH_OPTIONS to be
+    overridden.