Merge lp:~thomnico/charms/precise/dns/openstack-support into lp:~lazypower/charms/precise/dns/trunk

[Nicolas Thomas]

Fix that enable non EC2 environment (OpenStack/MAAS) to work with clearwater project.

[lp:~thomnico/charms/precise/dns/openstack-support]

10. By Nicolas Thomas on 2014-09-12

 OpenStack support

11. By Nicolas Thomas on 2014-09-12

Allow dns to use the provider dns as fowarder

=== modified file 'contrib/bind/provider.py'
--- contrib/bind/provider.py	2014-07-07 12:10:07 +0000
+++ contrib/bind/provider.py	2014-09-12 15:12:25 +0000
@@ -54,9 +54,11 @@
                              'update-retry': '15m',
                              'expiry': '3w',
                              'minimum': '3h'})
-        parser.dict_to_zone({'rr': 'NS', 'alias': '@', 'ttl': 1600,
-                             'addr': 'ns.%s.' % domain})
-        parser.dict_to_zone({'rr': 'A', 'alias': 'ns', 'addr': addr,
+        parser.dict_to_zone({'rr': 'NS', 'alias': '@',
+                             'addr': 'ns1.%s.' % domain})
+        parser.dict_to_zone({'rr': 'A', 'alias': '@', 'addr': addr,
+                             'ttl': 300})
+        parser.dict_to_zone({'rr': 'A', 'alias': 'ns1', 'addr': addr,
                              'ttl': 300})
 
     def reload_config(self):

=== added file 'contrib/bind/templates/named.conf.options.jinja2'
--- contrib/bind/templates/named.conf.options.jinja2	1970-01-01 00:00:00 +0000
+++ contrib/bind/templates/named.conf.options.jinja2	2014-09-12 15:12:25 +0000
@@ -0,0 +1,22 @@
+acl "trusted" {
+                localhost;
+                localnets;
+		any;
+        };
+  
+options {
+	directory "/var/cache/bind";
+
+    forwarders {
+	{{ forwarder }} ;
+	8.8.8.8 ;
+	};
+	dnssec-enable yes;
+	dnssec-validation yes;
+	auth-nxdomain no;    # conform to RFC1035
+	listen-on-v6 { any; };
+	allow-query { any; };
+	allow-recursion { trusted; };
+	allow-query-cache { trusted; };
+
+};

=== added file 'hooks/dns-client-relation-changed'
--- hooks/dns-client-relation-changed	1970-01-01 00:00:00 +0000
+++ hooks/dns-client-relation-changed	2014-09-12 15:12:25 +0000
@@ -0,0 +1,55 @@
+#!/usr/bin/python
+import os
+import sys
+# Add charmhelpers to the system path.
+try:
+    sys.path.insert(0, os.path.abspath(os.path.join(os.environ['CHARM_DIR'],
+                                                    'lib')))
+    sys.path.insert(0, os.path.abspath(os.path.join(os.environ['CHARM_DIR'],
+                                                    'contrib')))
+except:
+    sys.path.insert(0, os.path.abspath(os.path.join('..', 'lib')))
+    sys.path.insert(0, os.path.abspath(os.path.join('..', 'contrib')))
+
+
+from bind.provider import BindProvider
+
+from charmhelpers.core.hookenv import (
+    config,
+    unit_get,
+    relation_get,
+    relation_set,
+    relation_id,
+)
+
+from common import trim_empty_array_elements as trim
+from common import resolve_hostname_to_ip as getip
+
+
+class ProgrammableChanged(object):
+
+    def __init__(self):
+        self.config = config()
+        relid = relation_id()
+        relation_set(relid, {'public-address':
+                     getip(unit_get('public-address'))})
+        self.add_resource()
+
+    def add_resource(self):
+        domain = relation_get('domain')
+        # Do nothing if we didn't receive a RR to process
+        if not relation_get('resources'):
+            return
+
+        resources = trim(relation_get('resources').split('\n'))
+
+        if not domain:
+            domain = config()['domain']
+
+        if self.config['provider'] == 'bind':
+            bp = BindProvider()
+            bp.add_record(resources, domain)
+
+
+if __name__ == '__main__':
+    c = ProgrammableChanged()

=== modified file 'hooks/install'
--- hooks/install	2014-06-06 01:39:07 +0000
+++ hooks/install	2014-09-12 15:12:25 +0000
@@ -52,6 +52,22 @@
     def install_provider(self):
         if config()['provider'] == 'bind':
             ProviderInstaller()
+            ## use the nameserver in /etc/resolv.conf as a forwarder ...
+            import DNS
+            DNS.ParseResolvConf("/etc/resolv.conf")
+            nameserver = DNS.defaults['server'][0]
+            log('Setting dns to be forwarder to :'+nameserver)
+            import jinja2
+            templateLoader = jinja2.FileSystemLoader( searchpath= os.environ['CHARM_DIR'] )
+            #use Jinja2 template to enable bind forwarding 
+            templateEnv=jinja2.Environment( loader=templateLoader );
+            template=templateEnv.get_template('contrib/bind/templates/named.conf.options.jinja2')
+            output_from_parsed_template = template.render(forwarder=nameserver)
+            # to save the results
+            with open("/etc/bind/named.conf.options", "wb") as fh:
+                fh.write(output_from_parsed_template)
+                ## use jinja2 templates..
+
 
 if __name__ == '__main__':
     i = Install()

=== modified file 'hooks/programmable-relation-changed'
--- hooks/programmable-relation-changed	2014-06-06 01:39:07 +0000
+++ hooks/programmable-relation-changed	2014-09-12 15:12:25 +0000
@@ -37,9 +37,9 @@
         domain = relation_get('domain')
         alias = relation_get('alias')
         addr = relation_get('addr')
-        rr = relation_get('rr').upper()
+        #off#rr = relation_get('rr').upper()
 
-        parsed = {'domain': domain, 'alias': alias, 'addr': addr, 'rr': rr}
+        parsed = {'domain': domain, 'alias': alias, 'addr': addr}
 
         if self.config['provider'] == 'bind':
             bp = BindProvider()

=== modified file 'hooks/programmable-relation-departed'
--- hooks/programmable-relation-departed	2014-06-06 01:39:07 +0000
+++ hooks/programmable-relation-departed	2014-09-12 15:12:25 +0000
@@ -32,9 +32,9 @@
         domain = relation_get('domain')
         alias = relation_get('alias')
         addr = relation_get('addr')
-        rr = relation_get('rr').upper()
+        ##rr = relation_get('rr').upper()
 
-        parsed = {'domain': domain, 'alias': alias, 'addr': addr, 'rr': rr}
+        parsed = {'domain': domain, 'alias': alias, 'addr': addr}
 
         if self.config['provider'] == 'bind':
             bp = BindProvider()
@@ -43,4 +43,4 @@
 
 
 if __name__ == '__main__':
-    c = ProgrammableBroken()
\ No newline at end of file
+    c = ProgrammableBroken()

=== modified file 'lib/common.py'
--- lib/common.py	2014-07-07 12:10:07 +0000
+++ lib/common.py	2014-09-12 15:12:25 +0000
@@ -47,7 +47,11 @@
     hostname = hostname.strip()
     out = subprocess.check_output(['dig', '+short', hostname]).rstrip('\n')
     # required to obtain the IP from MAAS output. See test_common - line 83
-    return out.split('\n')[-1]
+    if out:
+        return out.split('\n')[-1]
+    else:
+        # got an empty resp means hostname=IP return it
+        return hostname
 
 
 # Parse existing nameservers from resolv.conf

=== modified file 'metadata.yaml'
--- metadata.yaml	2014-06-06 01:39:07 +0000
+++ metadata.yaml	2014-09-12 15:12:25 +0000
@@ -14,3 +14,5 @@
     interface: dns-multi
   auto-generated:
     interface: dns-auto
+  dns-client:
+    interface: dns-client
\ No newline at end of file

=== modified file 'requirements.txt'
--- requirements.txt	2014-07-07 12:10:07 +0000
+++ requirements.txt	2014-09-12 15:12:25 +0000
@@ -3,3 +3,4 @@
 mock
 coverage
 jinja2
+pydns