Merge lp:~niedbalski/ubuntu/precise/serverstack-dns/add-current-instances into lp:~openstack-charmers/ubuntu/precise/serverstack-dns/trunk

[Jorge Niedbalski]

Dear Maintainer:

- This patch adds the ability to populate the dnsmasq
file with the instances for the current tenant.
- It modifies the configuration to add a new entry called
'add_current_instances' which defaults to False.
- It modifies the logic for adding entries based on the
current tenant available instances and adds them to the
dnsmasq host file.

[lp:~niedbalski/ubuntu/precise/serverstack-dns/add-current-instances]

15. By Jorge Niedbalski on 2015-11-18

Defaults to false, non invasive change

[Liam Young (gnuoy)]

thanks for the feature! approved

review: Approve

=== modified file 'dns.conf'
--- dns.conf	2014-02-19 16:24:28 +0000
+++ dns.conf	2015-11-18 14:31:30 +0000
@@ -6,6 +6,8 @@
 hosts_file = /etc/serverstack-dns/tenant_hosts
 # domain name associated with tenant network
 domain = openstacklocal
+#add current tenant instances to the hosts
+add_current_instances=False
 
 # connection info for serverstack's rabbit server.  these settings
 # should match neutron's

=== modified file 'serverstack-tenant-dns'
--- serverstack-tenant-dns	2014-03-01 14:37:41 +0000
+++ serverstack-tenant-dns	2015-11-18 14:31:30 +0000
@@ -36,6 +36,7 @@
         'rabbit_host': _get('rabbit_host'),
         'rabbit_vhost': _get('rabbit_vhost'),
         'rabbit_exchange': _get('rabbit_exchange'),
+        'add_current_instances': _get('add_current_instances'),
         'rabbit_topic': _get('rabbit_topic'),
         'include_tenants': _get('include_tenants'),
         'hosts_file': _get('hosts_file'),
@@ -68,6 +69,7 @@
 
     with open(config['hosts_file']) as hosts:
         hostnames = hosts.readlines()
+
     hostnames = [host.strip() for host in hostnames
                  if not host.startswith('#')]
 
@@ -127,6 +129,21 @@
                       instance_id)
 
 
+def get_current_instances():
+    client = get_nova_client()
+    tenant_name = config['os_tenant_name']
+
+    for instance in client.servers.list():
+        networks = instance.networks.get('%s_admin_net' % tenant_name, None)
+        if networks:
+            yield get_instance_hostname(instance.id), networks[0]
+
+
+def add_current_instances():
+    for hostname, ip_addr in get_current_instances():
+        add_host_entry(hostname, ip_addr, "")
+
+
 def manage_dns(body, message):
     tenant_ids = [body['_context_tenant_id']]
     try:
@@ -206,6 +223,7 @@
             cmd = ['kill', '-HUP', pid]
             check_call(cmd)
             return
+
     logging.info('Starting new dnsmasq: %s' % ' '.join(cmd))
     check_call(cmd)
 
@@ -214,5 +232,10 @@
     if not os.path.isfile(config['hosts_file']):
         with open(config['hosts_file'], 'wb'):
             pass
+
+    add_current = config.get('add_current_instances', False)
+    if add_current:
+        add_current_instances()
+
     ensure_dnsmasq()
     listen()