summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-12-19 14:01:22 +0000
committerGerrit Code Review <review@openstack.org>2014-12-19 14:01:22 +0000
commit741df33386b7fd78b0b95e6a9399dd53afc99f62 (patch)
tree4a801ac17cf3401adeac3a7adfbff38e3974f3b5
parent2f7f4ed50c53e25041bf29d317c5f3358e46e706 (diff)
parent8dd57aa961b9aaf93d19bd71ab14746ed7a7a514 (diff)
Merge "Set default network interfaces to nic1"
-rw-r--r--compute.yaml2
-rw-r--r--controller.yaml2
-rw-r--r--overcloud-source.yaml4
-rw-r--r--overcloud-without-mergepy.yaml4
-rw-r--r--undercloud-bm-nova-deploy.yaml2
-rw-r--r--undercloud-vm-ironic-deploy.yaml2
-rw-r--r--undercloud-vm-nova-deploy.yaml2
7 files changed, 9 insertions, 9 deletions
diff --git a/compute.yaml b/compute.yaml
index c93bd627..ae02fef5 100644
--- 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:
diff --git a/controller.yaml b/controller.yaml
index 0e99cb04..9b3745dc 100644
--- 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:
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index f9698209..66c782cd 100644
--- 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 db9e5671..094332e2 100644
--- 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:
diff --git a/undercloud-bm-nova-deploy.yaml b/undercloud-bm-nova-deploy.yaml
index d46fc076..dca68329 100644
--- 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 3bf32a76..5d23495c 100644
--- 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 c6278a1b..da15b46d 100644
--- 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: