summaryrefslogtreecommitdiffstats
path: root/ocata
diff options
context:
space:
mode:
authorHuang Haibin <haibin.huang@intel.com>2017-12-13 13:16:32 +0800
committerHuang Haibin <haibin.huang@intel.com>2018-01-10 23:20:15 +0800
commit2f828075adeab453f357d56a8590baebd144bb3b (patch)
tree5e86675689edf641a90e077c7a2a33041893425e /ocata
parent4a60ce3227898ac1749c8000b6f1e1d4a222e25d (diff)
Fix interface name issue
Fix interface name issue in multicloud test due to vagrant box bento/ubuntu-16.04 update Issue-ID: MULTICLOUD-57 Change-Id: If43b2bdcd440149200a413789637e7f8ee51f25b Signed-off-by: Huang Haibin <haibin.huang@intel.com>
Diffstat (limited to 'ocata')
-rw-r--r--ocata/vagrant/bootstrap.sh9
-rw-r--r--ocata/vagrant/setup_compute.sh3
2 files changed, 7 insertions, 5 deletions
diff --git a/ocata/vagrant/bootstrap.sh b/ocata/vagrant/bootstrap.sh
index 2f2d1b12..8bbd7dd6 100644
--- a/ocata/vagrant/bootstrap.sh
+++ b/ocata/vagrant/bootstrap.sh
@@ -8,9 +8,10 @@ git clone https://github.com/openstack-dev/devstack
cd devstack; git checkout stable/ocata
sudo apt-get install openvswitch-switch -y
sudo ovs-vsctl add-br br-ex
-ip=$(ip a s enp0s9 | grep inet | grep -v inet6 | sed "s/.*inet//" | cut -f2 -d' ')
-sudo ip address flush enp0s9
-sudo ovs-vsctl add-port br-ex enp0s9
+ctl_if=$(ifconfig | grep 192.168.* -B 1 | awk -F " " 'NR==4{print $1}')
+ip=$(ip a s $ctl_if | grep inet | grep -v inet6 | sed "s/.*inet//" | cut -f2 -d' ')
+sudo ip address flush $ctl_if
+sudo ovs-vsctl add-port br-ex $ctl_if
sudo ip a a $ip dev br-ex
sudo ip link set dev br-ex up
-sudo ip link set dev enp0s9 up
+sudo ip link set dev $ctl_if up
diff --git a/ocata/vagrant/setup_compute.sh b/ocata/vagrant/setup_compute.sh
index 56ef08b6..3f503531 100644
--- a/ocata/vagrant/setup_compute.sh
+++ b/ocata/vagrant/setup_compute.sh
@@ -4,7 +4,8 @@ set -ex
cd devstack
cp /vagrant/compute.conf local.conf
-ip=$(ip a s enp0s8 | grep inet | grep -v inet6 | sed "s/.*inet //" | cut -f1 -d'/')
+data_if=$(ifconfig | grep 192.168.* -B 1 | awk -F " " 'NR==1{print $1}')
+ip=$(ip a s $data_if | grep inet | grep -v inet6 | sed "s/.*inet //" | cut -f1 -d'/')
host=$(hostname)
sed -i -e "s/HOSTIP/$ip/" -e "s/HOSTNAME/$host/" local.conf
./stack.sh