|
...
|
...
|
@@ -276,9 +276,22 @@ function configure_ironic_conductor {
|
|
276
|
276
|
iniset $IRONIC_CONF_FILE pxe tftp_server $HOST_IP
|
|
277
|
277
|
iniset $IRONIC_CONF_FILE pxe tftp_root $IRONIC_TFTPBOOT_DIR
|
|
278
|
278
|
iniset $IRONIC_CONF_FILE pxe tftp_master_path $IRONIC_TFTPBOOT_DIR/master_images
|
|
|
279
|
+
|
|
|
280
|
+ local pxe_params=""
|
|
279
|
281
|
if [[ "$IRONIC_VM_LOG_CONSOLE" == "True" ]] ; then
|
|
280
|
|
- iniset $IRONIC_CONF_FILE pxe pxe_append_params "nofb nomodeset vga=normal console=ttyS0"
|
|
|
282
|
+ pxe_params="nofb nomodeset vga=normal console=ttyS0"
|
|
|
283
|
+ fi
|
|
|
284
|
+
|
|
|
285
|
+ # When booting with less than 1GB, we need to switch from default tmpfs
|
|
|
286
|
+ # to ramfs for ramdisks to decompress successfully.
|
|
|
287
|
+ if [[ "$IRONIC_VM_SPECS_RAM" -lt 1024 ]]; then
|
|
|
288
|
+ pxe_params+=" rootfstype=ramfs"
|
|
281
|
289
|
fi
|
|
|
290
|
+
|
|
|
291
|
+ if [[ -n "$pxe_params" ]]; then
|
|
|
292
|
+ iniset $IRONIC_CONF_FILE pxe pxe_append_params "$pxe_params"
|
|
|
293
|
+ fi
|
|
|
294
|
+
|
|
282
|
295
|
if [[ "$IRONIC_DEPLOY_DRIVER" == "agent_ssh" ]] ; then
|
|
283
|
296
|
if [[ "$SWIFT_ENABLE_TEMPURLS" == "True" ]] ; then
|
|
284
|
297
|
iniset $IRONIC_CONF_FILE glance swift_temp_url_key $SWIFT_TEMPURL_KEY
|