Merge lp:~freyes/ubuntu/precise/serverstack-dns/index-out-of-range into lp:~openstack-charmers/ubuntu/precise/serverstack-dns/trunk

[Felipe Reyes]

Skip empty lines when iterating hosts file

If the hosts file contains empty lines a list index out of range exception
is raised

    Traceback (most recent call last):
      File "/usr/bin/serverstack-tenant-dns", line 256, in <module>
        add_current_instances()
      File "/usr/bin/serverstack-tenant-dns", line 144, in add_current_instances
        add_host_entry(hostname, ip_addr, "")
      File "/usr/bin/serverstack-tenant-dns", line 81, in add_host_entry
        hn = _hostname[1]
    IndexError: list index out of range

Unmerged revisions

17. By Felipe Reyes on 2016-09-13

Skip empty lines when iterating hosts file

If the hosts file contains empty lines a list index out of range exception
is raised

Traceback (most recent call last):
  File "/usr/bin/serverstack-tenant-dns", line 256, in <module>
    add_current_instances()
  File "/usr/bin/serverstack-tenant-dns", line 144, in add_current_instances
    add_host_entry(hostname, ip_addr, "")
  File "/usr/bin/serverstack-tenant-dns", line 81, in add_host_entry
    hn = _hostname[1]
IndexError: list index out of range

=== modified file 'serverstack-tenant-dns'
--- serverstack-tenant-dns	2016-03-07 18:06:43 +0000
+++ serverstack-tenant-dns	2016-09-13 17:11:01 +0000
@@ -76,6 +76,10 @@
     out = []
     # remove stale entries
     for hostname in hostnames:
+
+        if not hostname.strip():  # skip empty lines
+            continue
+
         _hostname = hostname.split(' ')
         ip = _hostname[0]
         hn = _hostname[1]