← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~rvb/maas/fix-local-bind into lp:maas

 

Raphaël Badin has proposed merging lp:~rvb/maas/fix-local-bind into lp:maas.

Commit message:
In the bind fixture: call generate_rndc with include_default_controls=False to avoid trying to bind to port 953.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~rvb/maas/fix-local-bind/+merge/130130

This branch tweaks the bindfixture so that it calls generate_rndc with include_default_controls=False to avoid including the default controls snippet (1) and thus avoid trying to bind to port 953.

(1) """controls { 
inet 127.0.0.1 port 953 allow { localhost; };
};
"""

This is to avoid the following error:

17-Oct-2012 16:29:02.903 sizing zone task pool based on 0 zones
17-Oct-2012 16:29:02.904 Warning: 'empty-zones-enable/disable-empty-zone' not set: disabling RFC 1918 empty zones
17-Oct-2012 16:29:02.905 none:0: open: /etc/bind/rndc.key: permission denied
17-Oct-2012 16:29:02.905 /home/rvb/canonical/fixture-error/run/named/named.conf:37: couldn't install keys for command channel 127.0.0.1#953: permission denied
17-Oct-2012 16:29:02.905 /home/rvb/canonical/fixture-error/run/named/named.conf:37: couldn't add command channel 127.0.0.1#953: permission denied
17-Oct-2012 16:29:02.905 ignoring config file logging statement due to -g option
17-Oct-2012 16:29:02.906 reloading configuration succeeded
17-Oct-2012 16:29:02.907 reloading zones succeeded
-- 
https://code.launchpad.net/~rvb/maas/fix-local-bind/+merge/130130
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~rvb/maas/fix-local-bind into lp:maas.
=== modified file 'src/maastesting/bindfixture.py'
--- src/maastesting/bindfixture.py	2012-09-18 15:30:59 +0000
+++ src/maastesting/bindfixture.py	2012-10-17 14:40:28 +0000
@@ -123,7 +123,8 @@
         """
         # Generate rndc configuration (rndc config and named snippet).
         rndcconf, namedrndcconf = generate_rndc(
-            self.rndc_port, 'dnsfixture-rndc-key')
+            port=self.rndc_port, key_name='dnsfixture-rndc-key',
+            include_default_controls=False)
         # Write main BIND config file.
         if should_write(self.conf_file, overwrite_config):
             named_conf = (