|
...
|
...
|
@@ -63,6 +63,7 @@ IRONIC_TEMPLATES_DIR=${IRONIC_TEMPLATES_DIR:-$TOP_DIR/tools/ironic/templates}
|
|
63
|
63
|
IRONIC_BAREMETAL_BASIC_OPS=$(trueorfalse False IRONIC_BAREMETAL_BASIC_OPS)
|
|
64
|
64
|
IRONIC_ENABLED_DRIVERS=${IRONIC_ENABLED_DRIVERS:-fake,pxe_ssh,pxe_ipmitool}
|
|
65
|
65
|
IRONIC_SSH_USERNAME=${IRONIC_SSH_USERNAME:-`whoami`}
|
|
|
66
|
+IRONIC_SSH_TIMEOUT=${IRONIC_SSH_TIMEOUT:-15}
|
|
66
|
67
|
IRONIC_SSH_KEY_DIR=${IRONIC_SSH_KEY_DIR:-$IRONIC_DATA_DIR/ssh_keys}
|
|
67
|
68
|
IRONIC_SSH_KEY_FILENAME=${IRONIC_SSH_KEY_FILENAME:-ironic_key}
|
|
68
|
69
|
IRONIC_KEY_FILE=${IRONIC_KEY_FILE:-$IRONIC_SSH_KEY_DIR/$IRONIC_SSH_KEY_FILENAME}
|
|
...
|
...
|
@@ -703,7 +704,7 @@ function ironic_ssh_check {
|
|
703
|
703
|
|
|
704
|
704
|
function configure_ironic_auxiliary {
|
|
705
|
705
|
configure_ironic_ssh_keypair
|
|
706
|
|
- ironic_ssh_check $IRONIC_KEY_FILE $IRONIC_VM_SSH_ADDRESS $IRONIC_VM_SSH_PORT $IRONIC_SSH_USERNAME 10
|
|
|
706
|
+ ironic_ssh_check $IRONIC_KEY_FILE $IRONIC_VM_SSH_ADDRESS $IRONIC_VM_SSH_PORT $IRONIC_SSH_USERNAME $IRONIC_SSH_TIMEOUT
|
|
707
|
707
|
}
|
|
708
|
708
|
|
|
709
|
709
|
function build_ipa_coreos_ramdisk {
|