openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Make $SSH_OPTIONS overrideable"

Browse Source
This commit is contained in:
Zuul 2018-11-08 03:39:09 +00:00 committed by Gerrit Code Review
commit f4711fe4af
2 changed files with 5 additions and 1 deletions

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 Normal file

@ -0,0 +1,4 @@
---
fixes:
- The deployed-server get-occ-config.sh script now allows $SSH_OPTIONS to be
overridden.