openstack/devstack
Code Issues Proposed changes

Merge "Remove sshd reconfig from lib/ironic"

Browse Source
This commit is contained in:
Jenkins 2014-04-17 21:07:50 +00:00 committed by Gerrit Code Review
commit 279d2bef69
1 changed files with 2 additions and 23 deletions

25
lib/ironic

@ -49,7 +49,7 @@ IRONIC_SSH_KEY_FILENAME=${IRONIC_SSH_KEY_FILENAME:-ironic_key}
IRONIC_KEY_FILE=$IRONIC_SSH_KEY_DIR/$IRONIC_SSH_KEY_FILENAME
IRONIC_SSH_VIRT_TYPE=${IRONIC_SSH_VIRT_TYPE:-virsh}
IRONIC_TFTPBOOT_DIR=${IRONIC_TFTPBOOT_DIR:-$IRONIC_DATA_DIR/tftpboot}
IRONIC_VM_SSH_PORT=${IRONIC_VM_SSH_PORT:-2222}
IRONIC_VM_SSH_PORT=${IRONIC_VM_SSH_PORT:-22}
IRONIC_VM_SSH_ADDRESS=${IRONIC_VM_SSH_ADDRESS:-$HOST_IP}
IRONIC_VM_COUNT=${IRONIC_VM_COUNT:-1}
IRONIC_VM_SPECS_CPU=${IRONIC_VM_SPECS_CPU:-1}
@ -432,31 +432,10 @@ function ironic_ssh_check {
fi
}
function configure_ironic_sshd {
# Ensure sshd server accepts connections from localhost only
SSH_CONFIG=/etc/ssh/sshd_config
HOST_PORT=$IRONIC_VM_SSH_ADDRESS:$IRONIC_VM_SSH_PORT
if ! sudo grep ListenAddress $SSH_CONFIG | grep $HOST_PORT; then
echo "ListenAddress $HOST_PORT" | sudo tee -a $SSH_CONFIG
fi
SSH_SERVICE_NAME=sshd
if is_ubuntu; then
SSH_SERVICE_NAME=ssh
fi
restart_service $SSH_SERVICE_NAME
# to ensure ssh service is up and running
sleep 3
ironic_ssh_check $IRONIC_SSH_KEY_DIR/$IRONIC_SSH_KEY_FILENAME $IRONIC_VM_SSH_ADDRESS $IRONIC_VM_SSH_PORT $IRONIC_SSH_USERNAME 10
}
function configure_ironic_auxiliary {
configure_ironic_dirs
configure_ironic_ssh_keypair
configure_ironic_sshd
ironic_ssh_check $IRONIC_SSH_KEY_DIR/$IRONIC_SSH_KEY_FILENAME $IRONIC_VM_SSH_ADDRESS $IRONIC_VM_SSH_PORT $IRONIC_SSH_USERNAME 10
}
# build deploy kernel+ramdisk, then upload them to glance