summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Gilliard <matthew.gilliard@hp.com>2014-04-10 09:39:21 +0100
committerGerrit Code Review <review@openstack.org>2014-04-23 17:00:13 +0000
commitd33a43761e87456d2ee9cf7fbf671a262dde8342 (patch)
tree71b6006236d180583296bf16b9da30a78ad4c347
parent439825b1b079d7bbf7f65f9c85f3adbed9ec204a (diff)
Increase PXE deployment timeout for overcloud
The PXE deployment often times out on baremetal deployment with >5 overcloud nodes because the time being measured includes the dd of the image, which can be slow when many images are sent from the same undercloud host. Ideally we'd make the image sizes smaller, and/or make the undercloud cache the images more sanely. It would also be possible to split the timout to measure dd-time and boot-time separately, but for now we just make the timeout configurable so a user can raise it if they have problems. Change-Id: I15540eec7a68eab4c9d128b65a95b1c0a2b64582 Co-Author: nicholas.randon@hp.com
-rw-r--r--undercloud-bm-source.yaml7
-rw-r--r--undercloud-vm-source.yaml7
2 files changed, 12 insertions, 2 deletions
diff --git a/undercloud-bm-source.yaml b/undercloud-bm-source.yaml
index ff00d28c..a1c0b98a 100644
--- a/undercloud-bm-source.yaml
+++ b/undercloud-bm-source.yaml
@@ -7,6 +7,10 @@ Parameters:
Default: nova.virt.baremetal.ipmi.IPMI
Description: Bare metal power manager driver.
Type: String
+ PxeDeployTimeout:
+ Default: 2400
+ Description: Timeout for PXE deployment of baremetal nodes
+ Type: Number
Resources:
undercloudConfig:
Type: AWS::AutoScaling::LaunchConfiguration
@@ -27,6 +31,7 @@ Resources:
db: mysql://nova:unset@localhost/nova_bm
power_manager:
Ref: PowerManager
- pxe_deploy_timeout: 2400
+ pxe_deploy_timeout:
+ Ref: PxeDeployTimeout
service-password:
Ref: NovaPassword
diff --git a/undercloud-vm-source.yaml b/undercloud-vm-source.yaml
index 48a6fffd..4e076fd3 100644
--- a/undercloud-vm-source.yaml
+++ b/undercloud-vm-source.yaml
@@ -7,6 +7,10 @@ Parameters:
Default: nova.virt.baremetal.virtual_power_driver.VirtualPowerManager
Description: Bare metal power manager driver.
Type: String
+ PxeDeployTimeout:
+ Default: 2400
+ Description: Timeout for PXE deployment of baremetal nodes
+ Type: Number
PowerSSHHost:
Default: 192.168.122.1
Description: SSH host to ssh to for power management operations.
@@ -39,7 +43,8 @@ Resources:
db: mysql://nova:unset@localhost/nova_bm
power_manager:
Ref: PowerManager
- pxe_deploy_timeout: 2400
+ pxe_deploy_timeout:
+ Ref: PxeDeployTimeout
virtual_power:
user:
Ref: PowerUserName