diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-05-05 22:12:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-05-05 22:12:03 +0000 |
| commit | 3ea6b2cbe1ee70d60fa1ebcbf084b390aab8266c (patch) | |
| tree | 98e723723d2e2f7d8641eafe4a2b622cea6cac3d | |
| parent | f7663a8973a508c8707b3a05621ac1d49eb6d627 (diff) | |
| parent | d33a43761e87456d2ee9cf7fbf671a262dde8342 (diff) | |
Merge "Increase PXE deployment timeout for overcloud"
| -rw-r--r-- | undercloud-bm-source.yaml | 7 | ||||
| -rw-r--r-- | undercloud-vm-source.yaml | 7 |
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 |