X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jenkins-scripts%2Fubuntu-docker-ovs.sh;h=743255b6975c2575f00207d485e7411f14f7b767;hb=7e9491bb72105fa920e96e92458f45d3ec740a6f;hp=34f4c9b4c0a778883a82f9df0c136a8e50c645bb;hpb=a7d457505082332fcb422dc342dad9b487fa4416;p=releng%2Fbuilder.git

diff --git a/jenkins-scripts/ubuntu-docker-ovs.sh b/jenkins-scripts/ubuntu-docker-ovs.sh
index 34f4c9b4c..743255b69 100755
--- a/jenkins-scripts/ubuntu-docker-ovs.sh
+++ b/jenkins-scripts/ubuntu-docker-ovs.sh
@@ -1,5 +1,17 @@
 #!/bin/bash
 
+# make sure we don't require tty for sudo operations
+cat <<EOF >/etc/sudoers.d/89-jenkins-user-defaults
+Defaults:jenkins !requiretty
+jenkins     ALL = NOPASSWD: ALL
+EOF
+
+# Add 'hostname' into /etc/hosts during node spinup time to avoid sudo returning
+# an 'unable to resolve host' message or some Java API's returning an unknown
+# host exception. The workaround on adding "myhostname" into /etc/nss-switch.conf
+# does not work on Ubuntu flavours.
+sed -i "/127.0.0.1/s/$/\t$(hostname)/" /etc/hosts
+
 # Do the final install of OVS that the has to be done at boot time for
 # some reason due to how the snapshots keep behaving.
 dpkg --install /root/openvswitch-datapath-dkms* && \
@@ -11,19 +23,4 @@ dpkg --install /root/openvswitch-{common,switch}*
 # pull docker images
 docker pull alagalah/odlpoc_ovs230
 
-
-# make sure we don't require tty for sudo operations
-cat <<EOF >/etc/sudoers.d/89-jenkins-user-defaults
-Defaults:jenkins !requiretty
-jenkins     ALL=NOPASSWD: /usr/bin/ovs-vsctl
-jenkins     ALL=NOPASSWD: /usr/bin/ovs-ofctl
-jenkins     ALL=NOPASSWD: /usr/bin/ovs-dpctl
-jenkins     ALL=NOPASSWD: /sbin/ip
-jenkins     ALL=NOPASSWD: /bin/mkdir
-jenkins     ALL=NOPASSWD: /bin/ln
-jenkins     ALL=NOPASSWD: /bin/rm
-jenkins     ALL=NOPASSWD: /etc/init.d/openvswitch-switch
-EOF
-
 # vim: sw=2 ts=2 sts=2 et :
-