Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Set rabbitmq heatbeat timeout threshold to 60"
[apex-tripleo-heat-templates.git]
/
undercloud-vm-ironic-deploy.yaml
diff --git
a/undercloud-vm-ironic-deploy.yaml
b/undercloud-vm-ironic-deploy.yaml
index
f1d3af7
..
5d23495
100644
(file)
--- a/
undercloud-vm-ironic-deploy.yaml
+++ b/
undercloud-vm-ironic-deploy.yaml
@@
-4,11
+4,11
@@
parameters:
description: Ironic password for keystone access
hidden: true
NeutronPublicInterface:
description: Ironic password for keystone access
hidden: true
NeutronPublicInterface:
- default:
eth0
+ default:
nic1
description: What interface to bridge onto br-ex for network nodes.
type: string
NovaComputeDriver:
description: What interface to bridge onto br-ex for network nodes.
type: string
NovaComputeDriver:
- default:
ironic.
nova.virt.ironic.driver.IronicDriver
+ default: nova.virt.ironic.driver.IronicDriver
description: Full class name for the Nova compute driver
type: string
NovaComputeManager:
description: Full class name for the Nova compute driver
type: string
NovaComputeManager:
@@
-16,7
+16,7
@@
parameters:
description: Full class name for the Nova compute manager
type: string
NovaSchedulerHostManager:
description: Full class name for the Nova compute manager
type: string
NovaSchedulerHostManager:
- default:
ironic.
nova.scheduler.ironic_host_manager.IronicHostManager
+ default: nova.scheduler.ironic_host_manager.IronicHostManager
description: Full class name for the Nova scheduler host manager
type: string
PowerSSHPrivateKey:
description: Full class name for the Nova scheduler host manager
type: string
PowerSSHPrivateKey: