From 9d088983d9ec2912ffe8bb5d31ac85e70953f549 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Wed, 17 Jul 2019 19:33:23 +0200
Subject: [PATCH] ipaserver_setup_dns: Properly set ip_addresses, domain and
realm
The parameters ip_addresses, domain and realm have not been properly set
for the setup of dns if _setup_dns as not enabled.
---
roles/ipaserver/library/ipaserver_setup_dns.py | 12 ++++++++++--
roles/ipaserver/tasks/install.yml | 3 +++
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/roles/ipaserver/library/ipaserver_setup_dns.py b/roles/ipaserver/library/ipaserver_setup_dns.py
index d079ecd6..e4f1d365 100644
--- a/roles/ipaserver/library/ipaserver_setup_dns.py
+++ b/roles/ipaserver/library/ipaserver_setup_dns.py
@@ -64,6 +64,9 @@ def main():
ansible_module = AnsibleModule(
argument_spec = dict(
### basic ###
+ ip_addresses=dict(required=False, type='list', default=[]),
+ domain=dict(required=True),
+ realm=dict(required=True),
hostname=dict(required=True),
### server ###
setup_dns=dict(required=True, type='bool'),
@@ -86,6 +89,10 @@ def main():
# set values ############################################################
### basic ###
+ options.ip_addresses = ansible_module_get_parsed_ip_addresses(
+ ansible_module)
+ options.domain_name = ansible_module.params.get('domain')
+ options.realm_name = ansible_module.params.get('realm')
options.host_name = ansible_module.params.get('hostname')
### server ###
options.setup_dns = ansible_module.params.get('setup_dns')
@@ -116,8 +123,9 @@ def main():
# Create a BIND instance
bind = bindinstance.BindInstance(fstore)
bind.set_output(ansible_log)
- bind.setup(host_name, ip_addresses, realm_name,
- domain_name, (), 'first', (),
+ bind.setup(options.host_name, options.ip_addresses,
+ options.realm_name,
+ options.domain_name, (), 'first', (),
zonemgr=options.zonemgr,
no_dnssec_validation=options.no_dnssec_validation)
bind.create_file_with_system_records()
diff --git a/roles/ipaserver/tasks/install.yml b/roles/ipaserver/tasks/install.yml
index 8f9b4ec1..1b0f059f 100644
--- a/roles/ipaserver/tasks/install.yml
+++ b/roles/ipaserver/tasks/install.yml
@@ -333,6 +333,9 @@
- name: Install - Setup DNS
ipaserver_setup_dns:
+ ip_addresses: "{{ ipaserver_ip_addresses | default([]) }}"
+ domain: "{{ result_ipaserver_test.domain }}"
+ realm: "{{ result_ipaserver_test.realm }}"
hostname: "{{ result_ipaserver_test.hostname }}"
setup_ca: "{{ result_ipaserver_test.setup_ca }}"
setup_dns: "{{ ipaserver_setup_dns }}"
--
GitLab