openstack
/
instack-undercloud
Code Issues Proposed changes

Set NeutronPublicInterface to nic1 

Updates the instack-deploy-overcloud script to use the 'nic1'
os-net-config naming abstraction instead of hard coding this
as eth0.

If you are deploying to real hardware eth0 most likely won't
exist and you'll get an error.

This also updates the rc scripts to match the defaults.

Change-Id: If478f685f1a07ca92f068240a54d5a3275cafb21
This commit is contained in:
Dan Prince 2015-03-13 11:48:34 -04:00 committed by James Slagle
parent 1fef61ee5c
commit 2eb0893030
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deploy-baremetal-overcloudrc
View File

@ -1,5 +1,5 @@
#!/bin/bash
export NeutronPublicInterface=em2
export NeutronPublicInterface=nic1
export OVERCLOUD_LIBVIRT_TYPE=kvm
export NETWORK_CIDR="10.0.0.0/8"
export FLOATING_IP_START="172.17.0.45"

2
scripts/instack-deploy-overcloud
View File

@ -69,7 +69,7 @@ source tripleo-undercloud-passwords
# Define the interface that will be bridged onto the Neutron defined
# network.
NeutronPublicInterface=${NeutronPublicInterface:-eth0}
NeutronPublicInterface=${NeutronPublicInterface:-nic1}
HypervisorNeutronPublicInterface=${HypervisorNeutronPublicInterface:-$NeutronPublicInterface}
NEUTRON_NETWORK_TYPE=${NEUTRON_NETWORK_TYPE:-gre}
NEUTRON_TUNNEL_TYPES=${NEUTRON_TUNNEL_TYPES:-gre}