merge with trunk

4 files changed, 69 insertions, 15 deletions

diff --git a/tools/clean-vlans b/tools/clean-vlans
index 820a9dbe5..a26ad86ad 100755
--- a/tools/clean-vlans
+++ b/tools/clean-vlans
@@ -17,9 +17,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-export LC_ALL=C 
+export LC_ALL=C
 
 sudo ifconfig -a | grep br | grep -v bridge | cut -f1 -d" " | xargs -n1 -ifoo ifconfig foo down
 sudo ifconfig -a | grep br | grep -v bridge | cut -f1 -d" " | xargs -n1 -ifoo brctl delbr foo
-sudo ifconfig -a | grep vlan | grep -v vlan124 | grep -v vlan5 | cut -f1 -d" " | xargs -n1 -ifoo ifconfig foo down
-sudo ifconfig -a | grep vlan | grep -v vlan124 | grep -v vlan5 | cut -f1 -d" " | xargs -n1 -ifoo vconfig rem foo
+sudo ifconfig -a | grep vlan | cut -f1 -d" " | xargs -n1 -ifoo ifconfig foo down
+sudo ifconfig -a | grep vlan | cut -f1 -d" " | xargs -n1 -ifoo vconfig rem foo
diff --git a/tools/esx/guest_tool.py b/tools/esx/guest_tool.py
index 13b0f8d33..97b5302ba 100644
--- a/tools/esx/guest_tool.py
+++ b/tools/esx/guest_tool.py
@@ -21,6 +21,7 @@ On Windows we require pyWin32 installed on Python.
 """

 

 import array

+import gettext

 import logging

 import os

 import platform

@@ -30,6 +31,8 @@ import subprocess
 import sys

 import time

 

+gettext.install('nova', unicode=1)

+

 PLATFORM_WIN = 'win32'

 PLATFORM_LINUX = 'linux2'

 ARCH_32_BIT = '32bit'

@@ -275,7 +278,8 @@ def _filter_duplicates(all_entries):
     return final_list

 

 

-def _set_rhel_networking(network_details=[]):

+def _set_rhel_networking(network_details=None):

+    network_details = network_details or []

     all_dns_servers = []

     for network_detail in network_details:

         mac_address, ip_address, subnet_mask, gateway, broadcast,\

@@ -315,6 +319,46 @@ def _set_rhel_networking(network_details=[]):
     _execute(['/sbin/service', 'network', 'restart'])

 

 

+def _set_ubuntu_networking(network_details=None):

+    network_details = network_details or []

+    """ Set IPv4 network settings for Ubuntu """

+    all_dns_servers = []

+    for network_detail in network_details:

+        mac_address, ip_address, subnet_mask, gateway, broadcast,\

+            dns_servers = network_detail

+        all_dns_servers.extend(dns_servers)

+        adapter_name, current_ip_address = \

+                _get_linux_adapter_name_and_ip_address(mac_address)

+

+        if adapter_name and not ip_address == current_ip_address:

+            interface_file_name = \

+                '/etc/network/interfaces'

+            # Remove file

+            os.remove(interface_file_name)

+            # Touch file

+            _execute(['touch', interface_file_name])

+            interface_file = open(interface_file_name, 'w')

+            interface_file.write('\nauto %s' % adapter_name)

+            interface_file.write('\niface %s inet static' % adapter_name)

+            interface_file.write('\nbroadcast %s' % broadcast)

+            interface_file.write('\ngateway %s' % gateway)

+            interface_file.write('\nnetmask %s' % subnet_mask)

+            interface_file.write('\naddress %s' % ip_address)

+            interface_file.close()

+    if all_dns_servers:

+        dns_file_name = "/etc/resolv.conf"

+        os.remove(dns_file_name)

+        _execute(['touch', dns_file_name])

+        dns_file = open(dns_file_name, 'w')

+        dns_file.write("; generated by OpenStack guest tools")

+        unique_entries = _filter_duplicates(all_dns_servers)

+        for dns_server in unique_entries:

+            dns_file.write("\nnameserver %s" % dns_server)

+        dns_file.close()

+    print "\nRestarting networking....\n"

+    _execute(['/etc/init.d/networking', 'restart'])

+

+

 def _linux_set_networking():

     """Set IP address for the Linux VM."""

     vmware_tools_bin = None

@@ -330,8 +374,13 @@ def _linux_set_networking():
         cmd = [vmware_tools_bin, '--cmd', 'machine.id.get']

         network_details = _parse_network_details(_execute(cmd,

                                                 check_exit_code=False))

-        # TODO(sateesh): For other distros like ubuntu, suse, debian, BSD, etc.

-        _set_rhel_networking(network_details)

+        # TODO(sateesh): For other distros like suse, debian, BSD, etc.

+        if(platform.dist()[0] == 'Ubuntu'):

+            _set_ubuntu_networking(network_details)

+        elif (platform.dist()[0] == 'redhat'):

+            _set_rhel_networking(network_details)

+        else:

+            logging.warn(_("Distro '%s' not supported") % platform.dist()[0])

     else:

         logging.warn(_("VMware Tools is not installed"))

 

diff --git a/tools/nova-debug b/tools/nova-debug
index 3ff68ca35..0a78af16a 100755
--- a/tools/nova-debug
+++ b/tools/nova-debug
@@ -30,13 +30,15 @@ cd $INSTANCES_PATH/$1
 if [ $CMD != "umount" ] && [ $CMD != "launch" ]; then
 # destroy the instance
 virsh destroy $1
+virsh undefine $1
 
 # mount the filesystem
 mkdir t
-DEVICE=`losetup --show -f disk`
+DEVICE=/dev/nbd0
 echo $DEVICE
-kpartx -a $DEVICE
-mount /dev/mapper/${DEVICE:4}p1 t
+qemu-nbd -c $DEVICE disk
+sleep 3
+mount $DEVICE t
 
 fi
 if [ $CMD != "mount" ] &&  [ $CMD != "umount" ]; then
@@ -66,11 +68,13 @@ sed -i "s/<serial type=\"file\">.*<\/serial>/<serial type=\"pty\"><source path=\
 
 umount t
 
-virsh create debug.xml
+virsh define debug.xml
+virsh start $1
 virsh console $1
 virsh destroy $1
+virsh undefine $1
 
-mount /dev/mapper/${DEVICE:4}p1 t
+mount $DEVICE t
 
 # clear debug root password
 chroot t passwd -l root
@@ -83,10 +87,11 @@ if [ $CMD != "mount" ] && [ $CMD != "launch" ]; then
 
 # unmount the filesystem
 umount t
-kpartx -d $DEVICE
-losetup -d $DEVICE
+qemu-nbd -d $DEVICE
 rmdir t
 
 # recreate the instance
-virsh create libvirt.xml
+virsh define libvirt.xml
+virsh start $1
 fi
+
diff --git a/tools/pip-requires b/tools/pip-requires
index 6e686b7e7..dec93c351 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -9,7 +9,7 @@ boto==1.9b
 carrot==0.10.5
 eventlet
 lockfile==0.8
-python-novaclient==2.5.3
+python-novaclient==2.5.7
 python-daemon==1.5.5
 python-gflags==1.3
 redis==2.0.0