Merge lp:~bgh/nova/ubuntu into lp:~openstack-ubuntu-packagers/nova/ubuntu

[Brad Hall]

[Vish Ishaya (vishvananda)]

this could probably be a separate bug but I just noticed the arping line is wrong.
It says:

/usr/bin/arping

but on ubuntu it should be:

/usr/sbin/arping

Might be useful to change that while you are editing the line.

[Brad Hall (bgh)]

Looks like that depends on whether you install iputils-arping or arping .. for some reason on my oneiric machine iputils-arping got installed (/usr/bin/arping). On natty the arping package is installed (/usr/sbin/arping). Anyhow, I'll update the merge prop as we probably want to use the arping package anyways (as opposed to iputils-arping).

[lp:~bgh/nova/ubuntu]

196. By Brad Hall on 2011-11-16

Change arping location

If you install the "arping" package on ubuntu, arping will land in /usr/sbin.
However, if you install iputils-arping, then arping will land in /usr/bin. I
think we want the one from the arping package and not iputils.

Unmerged revisions

196. By Brad Hall on 2011-11-16

Change arping location

If you install the "arping" package on ubuntu, arping will land in /usr/sbin.
However, if you install iputils-arping, then arping will land in /usr/bin. I
think we want the one from the arping package and not iputils.

195. By Brad Hall on 2011-10-28

Add ovs-vsctl and tunctl to the sudoers comand

This fixes launchpad bug: 882568

=== modified file 'debian/nova_sudoers'
--- debian/nova_sudoers	2011-09-20 14:09:55 +0000
+++ debian/nova_sudoers	2011-11-16 18:49:27 +0000
@@ -41,7 +41,9 @@
                       /usr/bin/socat,                           \
                       /sbin/parted,                             \
                       /usr/sbin/dnsmasq,                        \
-                      /usr/bin/arping
+                      /usr/sbin/arping,                         \
+		      /usr/sbin/tunctl,                         \
+		      /usr/bin/ovs-vsctl
 
 nova ALL = (root) NOPASSWD: SETENV: NOVACMDS