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

diff --git a/undercloud-bm.yaml b/undercloud-bm.yaml
index 3006cd0..7ec33d9 100644 (file)
--- 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 ebe09b1..41fb666 100644 (file)
--- 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]