openstack
/
designate
Code Issues Proposed changes

Added "view" option to bind9 rndc options 

Change-Id: I53fb454e785bf45be2860d32416e99efe6ca3b3f
This commit is contained in:
Tom Walsh 2016-03-22 10:56:13 -05:00 committed by Graham Hayes
parent f591b43bd9
commit 7b5e1fd321
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
designate/backend/impl_bind9.py Normal file → Executable file
View File

@ -44,6 +44,7 @@ class Bind9Backend(base.Backend):
# TODO(Federico): make attributes private, run _rndc_base at init time
self.host = self.options.get('host', '127.0.0.1')
self.port = int(self.options.get('port', 53))
self.view = self.options.get('view')
self.rndc_host = self.options.get('rndc_host', '127.0.0.1')
self.rndc_port = int(self.options.get('rndc_port', 953))
self.rndc_config_file = self.options.get('rndc_config_file')
@ -68,10 +69,15 @@ class Bind9Backend(base.Backend):
# Ensure different MiniDNS instances are targeted for AXFRs
random.shuffle(masters)
if self.view:
view = 'in %s' % self.view
else:
view = ''
rndc_op = [
'addzone',
'%s { type slave; masters { %s;}; file "slave.%s%s"; };' %
(zone['name'].rstrip('.'), '; '.join(masters), zone['name'],
'%s %s { type slave; masters { %s;}; file "slave.%s%s"; };' %
(zone['name'].rstrip('.'), view, '; '.join(masters), zone['name'],
zone['id']),
]
@ -91,9 +97,15 @@ class Bind9Backend(base.Backend):
Do not raise exceptions if the zone does not exist.
"""
LOG.debug('Delete Zone')
if self.view:
view = 'in %s' % self.view
else:
view = ''
rndc_op = [
'delzone',
'%s' % zone['name'].rstrip('.'),
'%s %s' % (zone['name'].rstrip('.'), view),
]
if self.clean_zonefile:
rndc_op.insert(1, '-clean')