openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Drop NeutronNativePXE option from undercloud tmpls"

Browse Source
This commit is contained in:
Jenkins 2013-11-07 08:31:11 +00:00 committed by Gerrit Code Review
commit dea5f2faac
2 changed files with 0 additions and 12 deletions

6
undercloud-bm.yaml

@ -41,10 +41,6 @@ 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.
NeutronPublicInterface:
Default: eth2
Description: What interface to bridge onto br-ex for network nodes.
@ -163,8 +159,6 @@ 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]

6
undercloud-vm.yaml

@ -41,10 +41,6 @@ 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.
NeutronPublicInterface:
Default: eth0
Description: What interface to bridge onto br-ex for network nodes.
@ -174,8 +170,6 @@ 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]