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

diff --git a/compute.yaml b/compute.yaml
index 7024d25..184c5cb 100644 (file)
--- a/compute.yaml
+++ b/compute.yaml
@@ -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:

diff --git a/controller.yaml b/controller.yaml
index 0c76f49..e25c833 100644 (file)
--- a/controller.yaml
+++ b/controller.yaml
@@ -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:

diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index a325257..9de6b7f 100644 (file)
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -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:

diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
index 602e795..8cb041b 100644 (file)
--- a/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@ -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:

diff --git a/undercloud-bm-nova-deploy.yaml b/undercloud-bm-nova-deploy.yaml
index d46fc07..dca6832 100644 (file)
--- a/undercloud-bm-nova-deploy.yaml
+++ b/undercloud-bm-nova-deploy.yaml
@@ -1,6 +1,6 @@
 parameters:
   NeutronPublicInterface:
-    default: eth2
+    default: nic1
     description: What interface to bridge onto br-ex for network nodes.
     type: string
   NovaComputeDriver:

diff --git a/undercloud-vm-ironic-deploy.yaml b/undercloud-vm-ironic-deploy.yaml
index 3bf32a7..5d23495 100644 (file)
--- a/undercloud-vm-ironic-deploy.yaml
+++ b/undercloud-vm-ironic-deploy.yaml
@@ -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:

diff --git a/undercloud-vm-nova-deploy.yaml b/undercloud-vm-nova-deploy.yaml
index c6278a1..da15b46 100644 (file)
--- a/undercloud-vm-nova-deploy.yaml
+++ b/undercloud-vm-nova-deploy.yaml
@@ -1,6 +1,6 @@
 parameters:
   NeutronPublicInterface:
-    default: eth0
+    default: nic1
     description: What interface to bridge onto br-ex for network nodes.
     type: string
   NovaComputeDriver: