Merge "Set default network interfaces to nic1"

2014-12-19 14:01:22 +00:00 · 2014-12-19 14:01:22 +00:00 · 741df33386
commit 741df33386
parent 2f7f4ed50c 8dd57aa961
7 changed files with 9 additions and 9 deletions
--- a/compute.yaml
+++ b/compute.yaml
@ -147,7 +147,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:
--- a/controller.yaml
+++ b/controller.yaml
@ -243,7 +243,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:
--- 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:
--- 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:
@ -397,7 +397,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:
--- 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:
--- 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:
--- 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: