From fff47517c03d02b25fcac6ac40bb9c93db53fd9e Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Tue, 5 Nov 2013 12:38:56 +0800 Subject: Drop NeutronNativePXE option from undercloud tmpls Depends on https://review.openstack.org/55338 We now just want to default to using Neutron native PXE. Change-Id: Idec46638b88d7c050e721588e5dbddf233d02493 --- undercloud-bm.yaml | 6 ------ undercloud-vm.yaml | 6 ------ 2 files changed, 12 deletions(-) diff --git a/undercloud-bm.yaml b/undercloud-bm.yaml index 3006cd0f..7ec33d9b 100644 --- a/undercloud-bm.yaml +++ b/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] diff --git a/undercloud-vm.yaml b/undercloud-vm.yaml index ebe09b16..41fb666a 100644 --- a/undercloud-vm.yaml +++ b/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] -- cgit 1.2.3-korg