From 2eb0893030376bd48f26dc005d72449507844da6 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Fri, 13 Mar 2015 11:48:34 -0400 Subject: [PATCH] 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 --- deploy-baremetal-overcloudrc | 2 +- scripts/instack-deploy-overcloud | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy-baremetal-overcloudrc b/deploy-baremetal-overcloudrc index 9adaada2b..df06f6bb2 100644 --- a/deploy-baremetal-overcloudrc +++ b/deploy-baremetal-overcloudrc @@ -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" diff --git a/scripts/instack-deploy-overcloud b/scripts/instack-deploy-overcloud index 69dbcfc9d..e66b7a2cd 100755 --- a/scripts/instack-deploy-overcloud +++ b/scripts/instack-deploy-overcloud @@ -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}