Set default network interfaces to nic1

Now that we are using os-net-config we can make use of
the nic naming abstraction layer where the actual physical
nic name is mapped automatically.

This change removes all the eth0 references and replaces
them with nic1 which should make it more likely
that these default values would actually work on
some distributions.

It also removes the single instance of eth2 in the
undercloud-bm-nova-deploy.yaml template and replaces
it with nic1 as well. Underclouds aren't a special case
in this regard (I run my bare metal undercloud on em1)
so there is no good reason to default to the second nic.

Change-Id: I3ea92a502bc4b8789f74913f232ac8bc6b843008
This commit is contained in:
Dan Prince 2014-11-25 15:23:22 -05:00
parent fc0158c38c
commit 8dd57aa961
7 changed files with 9 additions and 9 deletions

View File

@ -148,7 +148,7 @@ parameters:
description: An OVS bridge to create for accessing external networks.
type: string
NeutronPublicInterface:
default: eth0
default: nic1
description: A port to add to the NeutronPhysicalBridge.
type: string
NeutronTunnelTypes:

View File

@ -213,7 +213,7 @@ parameters:
type: string
hidden: true
NeutronPublicInterface:
default: eth0
default: nic1
description: What interface to bridge onto br-ex for network nodes.
type: string
NeutronPublicInterfaceTag:

View File

@ -151,7 +151,7 @@ parameters:
the openvswitch agent. Typically should not need to be changed.
type: string
HypervisorNeutronPublicInterface:
default: 'eth0'
default: nic1
description: What interface to add to the HypervisorNeutronPhysicalBridge.
type: string
ImageUpdatePolicy:
@ -234,7 +234,7 @@ parameters:
type: string
hidden: true
NeutronPublicInterface:
default: eth0
default: nic1
description: What interface to bridge onto br-ex for network nodes.
type: string
NeutronPublicInterfaceDefaultRoute:

View File

@ -94,7 +94,7 @@ parameters:
type: string
hidden: true
NeutronPublicInterface:
default: eth0
default: nic1
description: What interface to bridge onto br-ex for network nodes.
type: string
NeutronPublicInterfaceTag:
@ -353,7 +353,7 @@ parameters:
the openvswitch agent. Typically should not need to be changed.
type: string
HypervisorNeutronPublicInterface:
default: 'eth0'
default: nic1
description: What interface to add to the HypervisorNeutronPhysicalBridge.
type: string
NeutronNetworkVLANRanges:

View File

@ -1,6 +1,6 @@
parameters:
NeutronPublicInterface:
default: eth2
default: nic1
description: What interface to bridge onto br-ex for network nodes.
type: string
NovaComputeDriver:

View File

@ -4,7 +4,7 @@ parameters:
description: Ironic password for keystone access
hidden: true
NeutronPublicInterface:
default: eth0
default: nic1
description: What interface to bridge onto br-ex for network nodes.
type: string
NovaComputeDriver:

View File

@ -1,6 +1,6 @@
parameters:
NeutronPublicInterface:
default: eth0
default: nic1
description: What interface to bridge onto br-ex for network nodes.
type: string
NovaComputeDriver: