Properly handle --no-reverse being passed on the CLI in interactive mode

If installing in interactive mode and --no-reverse is passed then the
reverse zone was still being created.

ticket 1152
This commit is contained in:
Rob Crittenden 2011-05-11 16:49:43 -04:00 committed by Martin Kosek
parent e2aab9636e
commit 2b45be23e4
2 changed files with 14 additions and 6 deletions

View File

@ -290,9 +290,13 @@ def install_bind(config, options):
if options.unattended:
# In unattended mode just use the cmdline flag
create_reverse = not options.no_reverse
elif not options.no_reverse:
# In interactive mode, if the flag was not explicitly specified, ask the user
create_reverse = bindinstance.create_reverse()
else:
if options.no_reverse:
create_reverse = False
else:
# In interactive mode, if the flag was not explicitly
# specified, ask the user
create_reverse = bindinstance.create_reverse()
bind.setup(config.host_name, ip_address, config.realm_name,
config.domain_name, forwarders, options.conf_ntp, create_reverse)

View File

@ -908,9 +908,13 @@ def main():
if options.unattended:
# In unattended mode just use the cmdline flag
create_reverse = not options.no_reverse
elif not options.no_reverse:
# In interactive mode, if the flag was not explicitly specified, ask the user
create_reverse = bindinstance.create_reverse()
else:
if options.no_reverse:
create_reverse = False
else:
# In interactive mode, if the flag was not explicitly
# specified, ask the user
create_reverse = bindinstance.create_reverse()
bind.setup(host_name, ip_address, realm_name, domain_name, dns_forwarders, options.conf_ntp, create_reverse, zonemgr=options.zonemgr)
if options.setup_dns: