diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2013-11-07 08:31:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2013-11-07 08:31:11 +0000 |
| commit | dea5f2faacb4c051c77d84959233101fa119919b (patch) | |
| tree | d4f43a8b6472c64cea2b7323253f540547626a88 | |
| parent | df18ea222c606619e7567f8968cbc6d69a5c61c3 (diff) | |
| parent | fff47517c03d02b25fcac6ac40bb9c93db53fd9e (diff) | |
Merge "Drop NeutronNativePXE option from undercloud tmpls"
| -rw-r--r-- | undercloud-bm.yaml | 6 | ||||
| -rw-r--r-- | undercloud-vm.yaml | 6 |
2 files changed, 0 insertions, 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] |