diff options
| author |   Dan Prince <dprince@redhat.com> | 2014-11-25 15:23:22 -0500 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2014-12-05 15:16:12 -0500 |
| commit | 8dd57aa961b9aaf93d19bd71ab14746ed7a7a514 (patch) | |
| tree | 00d836f795078c6c62ae837c82d73382fffe30fa | |
| parent | fc0158c38c41f7142c8bdb2e4ec154012ad88e53 (diff) | |
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
| -rw-r--r-- | compute.yaml | 2 | ||||
| -rw-r--r-- | controller.yaml | 2 | ||||
| -rw-r--r-- | overcloud-source.yaml | 4 | ||||
| -rw-r--r-- | overcloud-without-mergepy.yaml | 4 | ||||
| -rw-r--r-- | undercloud-bm-nova-deploy.yaml | 2 | ||||
| -rw-r--r-- | undercloud-vm-ironic-deploy.yaml | 2 | ||||
| -rw-r--r-- | undercloud-vm-nova-deploy.yaml | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/compute.yaml b/compute.yaml index 7024d25b..184c5cb8 100644 --- 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 0c76f496..e25c8337 100644 --- 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 a3252571..9de6b7f9 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 602e7958..8cb041b7 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: @@ -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 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: |