Browse Source

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 30741a22d7)
changes/42/618842/1
James Slagle 3 years ago
committed by Alex Schultz
parent
commit
3469955cac
  1. 2
      deployed-server/scripts/get-occ-config.sh
  2. 4
      releasenotes/notes/overrideable-ssh-options-1bd4a78408eb6c2c.yaml

2
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"}

4
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.
Loading…
Cancel
Save