summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Collins <rbtcollins@hp.com>2013-09-17 09:32:18 +1200
committerRobert Collins <rbtcollins@hp.com>2013-09-17 09:32:18 +1200
commita0cc5554a4cf01ca09565a0641f10799aa873897 (patch)
tree98046e06b32f50f0f041de75d4df64a01ab0741f
parentca4c32c086ae0584820a5833d826855e40814b53 (diff)
Allow customising the Nova BM architecture.
Nova BM can only run one architecture at a time, and the incubator currently documents running sed against undercloud-vm.yaml! Change-Id: Ib157cf405a40fa983f1df3fb3ed62d04262e3e81
-rw-r--r--undercloud-vm.yaml7
1 files changed, 6 insertions, 1 deletions
diff --git a/undercloud-vm.yaml b/undercloud-vm.yaml
index 8a3a9d25..7bcc8f29 100644
--- a/undercloud-vm.yaml
+++ b/undercloud-vm.yaml
@@ -9,6 +9,10 @@ Parameters:
Default: unset
Description: The keystone auth secret.
Type: String
+ BaremetalArch:
+ Default: i386
+ Description: The architecture to use in Nova-BM - i386 or amd64.
+ Type: String
Flavor:
Default: baremetal
Description: Flavor to request when deploying.
@@ -132,7 +136,8 @@ Resources:
ram_allocation_ratio: 1.0
reserved_host_memory_mb: 0
baremetal:
- arch: i386
+ arch:
+ Ref: BaremetalArch
db: mysql://nova:unset@localhost/nova_bm
power_manager: nova.virt.baremetal.virtual_power_driver.VirtualPowerManager
pxe_deploy_timeout: 2400