openstack: the device may be eth0 or ens3

Signed-off-by: Loic Dachary <ldachary@redhat.com>

diff --git a/teuthology/openstack/openstack-teuthology.init b/teuthology/openstack/openstack-teuthology.init
index 15f2a459e08ac22327576b511e060b5e6f4da6d7..87bf35be44e57d277e2e56a8310876ab4c40ea19 100755 (executable)
--- a/teuthology/openstack/openstack-teuthology.init
+++ b/teuthology/openstack/openstack-teuthology.init
@@ -194,7 +194,10 @@ case $1 in
                 /etc/init.d/beanstalkd stop
                 source /home/$user/teuthology/virtualenv/bin/activate
                 source /home/$user/openrc.sh
-                ip=$(ip a show dev eth0 | sed -n "s:.*inet \(.*\)/.*:\1:p")
+               for dev in eth0 ens3 ; do
+                   ip=$(ip a show dev $dev 2>/dev/null | sed -n "s:.*inet \(.*\)/.*:\1:p")
+                   test "$ip" && break
+               done
                 openstack server list --long -f json --name target | \
                     jq ".[] | select(.Properties | contains(\"ownedby='$ip'\")) | .ID" | \
                     xargs --no-run-if-empty --max-args 1 -P20 openstack server delete --wait

diff --git a/teuthology/openstack/setup-openstack.sh b/teuthology/openstack/setup-openstack.sh
index d18fab90ce05e9d3a04c120fa8e9e36d39447146..a6e6ad675db27b4c32946db2304d6e38ee494a10 100755 (executable)
--- a/teuthology/openstack/setup-openstack.sh
+++ b/teuthology/openstack/setup-openstack.sh
@@ -369,6 +369,7 @@ function delete_keypair() {
 
 function setup_dnsmasq() {
     local provider=$1
+    local dev=$2
 
     if ! test -f /etc/dnsmasq.d/resolv ; then
         resolver=$(grep nameserver /etc/resolv.conf | head -1 | perl -ne 'print $1 if(/\s*nameserver\s+([\d\.]+)/)')
@@ -383,7 +384,7 @@ function setup_dnsmasq() {
         sudo resolvconf -u
         if test $provider = cloudlab ; then
             sudo perl -pi -e 's/.*(prepend domain-name-servers 127.0.0.1;)/\1/' /etc/dhcp/dhclient.conf
-            sudo bash -c 'ifdown eth0 ; ifup eth0'
+            sudo bash -c "ifdown $dev ; ifup $dev"
         fi
         echo "INSTALLED dnsmasq and configured to be a resolver"
     else
@@ -640,7 +641,11 @@ function main() {
             ;;
     esac
 
-    local ip=$(ip a show dev eth0 | sed -n "s:.*inet \(.*\)/.*:\1:p")
+    local ip
+    for dev in eth0 ens3 ; do
+        ip=$(ip a show dev $dev 2>/dev/null | sed -n "s:.*inet \(.*\)/.*:\1:p")
+        test "$ip" && break
+    done
     : ${nameserver:=$ip}
 
     if $do_create_config ; then
@@ -666,7 +671,7 @@ function main() {
     fi
 
     if $do_setup_dnsmasq ; then
-        setup_dnsmasq $provider || return 1
+        setup_dnsmasq $provider $dev || return 1
         define_dnsmasq "$subnets" $labdomain || return 1
     fi