summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-09-30 03:36:48 +0000
committerGerrit Code Review <review@openstack.org>2013-09-30 03:36:48 +0000
commitfaa7cfbb196f399a41f337d2b21984f9184ed1b5 (patch)
treed7c7afedfa89c3f84eac2d6d7ac8a0cd53c4b901
parent3167fb44f01fa15b9cd482d089fca3f41bb607f9 (diff)
parent43a95362d4b182ab78302d985cc5c0f115139909 (diff)
Merge "Make it possible to enable native neutron PXE."
-rw-r--r--undercloud-vm.yaml6
1 files changed, 6 insertions, 0 deletions
diff --git a/undercloud-vm.yaml b/undercloud-vm.yaml
index 0da1dabb..8c948caf 100644
--- a/undercloud-vm.yaml
+++ b/undercloud-vm.yaml
@@ -40,6 +40,10 @@ Parameters:
Description: The password for the neutron service account, used by neutron agents.
Type: String
NoEcho: true
+ NeutronNativePXE:
+ Default: ''
+ Type: String
+ Description: Set truthy to enable Neutron native PXE.
NovaPassword:
Default: unset
Description: The password for the nova service account, used by nova-api.
@@ -160,6 +164,8 @@ Resources:
Ref: NovaPassword
neutron:
host: 127.0.0.1
+ native_pxe:
+ Ref: NeutronNativePXE
ovs_db: mysql://neutron:unset@localhost/ovs_neutron?charset=utf8
ovs:
dnsmasq_range: [192.0.2.25, 192.0.2.44]