Remove unused arguments

In the dogtag/ca/kra instances self.domain is never used.
Remove it.

Signed-off-by: Simo Sorce <simo@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>

4 files changed, 9 insertions, 15 deletions

diff --git a/ipaserver/install/ca.py b/ipaserver/install/ca.py
index 7e08b5ac0..3c36e1b66 100644
--- a/ipaserver/install/ca.py
+++ b/ipaserver/install/ca.py
@@ -156,18 +156,17 @@ def install_step_0(standalone, replica_config, options):
     if standalone:
         ca.create_ra_agent_db = False
     if external == 0:
-        ca.configure_instance(host_name, domain_name, dm_password,
+        ca.configure_instance(host_name, dm_password,
                               dm_password, subject_base=subject_base,
                               ca_signing_algorithm=options.ca_signing_algorithm)
     elif external == 1:
-        ca.configure_instance(host_name, domain_name, dm_password,
+        ca.configure_instance(host_name, dm_password,
                               dm_password, csr_file=paths.ROOT_IPA_CSR,
                               subject_base=subject_base,
                               ca_signing_algorithm=options.ca_signing_algorithm,
                               ca_type=options.external_ca_type)
     else:
-        ca.configure_instance(host_name, domain_name, dm_password,
-                              dm_password,
+        ca.configure_instance(host_name, dm_password, dm_password,
                               cert_file=external_cert_file.name,
                               cert_chain_file=external_ca_file.name,
                               subject_base=subject_base,
diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py
index 85ce6cba5..5af9f4663 100644
--- a/ipaserver/install/cainstance.py
+++ b/ipaserver/install/cainstance.py
@@ -277,7 +277,7 @@ class CADSInstance(service.Service):
     The CA DS was used with Dogtag 9. Only upgraded installations still use it.
     Thus this class only does uninstallation.
     """
-    def __init__(self, host_name=None, realm_name=None, domain_name=None, dm_password=None, dogtag_constants=None):
+    def __init__(self, host_name=None, realm_name=None, dm_password=None, dogtag_constants=None):
         service.Service.__init__(
             self, "pkids",
             service_desc="directory server for the CA",
@@ -288,7 +288,6 @@ class CADSInstance(service.Service):
         self.serverid = "PKI-IPA"
         self.realm = realm_name
         self.sub_dict = None
-        self.domain = domain_name
         self.fqdn = host_name
         self.dercert = None
         self.pkcs12_info = None
@@ -387,7 +386,7 @@ class CAInstance(DogtagInstance):
         self.requestId = None
         self.log = log_mgr.get_logger(self)
 
-    def configure_instance(self, host_name, domain, dm_password,
+    def configure_instance(self, host_name, dm_password,
                            admin_password, ds_port=DEFAULT_DSPORT,
                            pkcs12_info=None, master_host=None, csr_file=None,
                            cert_file=None, cert_chain_file=None,
@@ -406,7 +405,6 @@ class CAInstance(DogtagInstance):
            csr_file. For step 2 set cert_file and cert_chain_file.
         """
         self.fqdn = host_name
-        self.domain = domain
         self.dm_password = dm_password
         self.admin_password = admin_password
         self.ds_port = ds_port
@@ -1529,7 +1527,7 @@ def install_replica_ca(config, postinstall=False):
         # If installing this afterward the Apache NSS database already
         # exists, don't remove it.
         ca.create_ra_agent_db = False
-    ca.configure_instance(config.host_name, config.domain_name,
+    ca.configure_instance(config.host_name,
                           config.dirman_password, config.dirman_password,
                           pkcs12_info=(cafile,),
                           master_host=config.master_host_name,
@@ -1827,4 +1825,4 @@ if __name__ == "__main__":
     ds = dsinstance.DsInstance()
 
     ca = CAInstance("EXAMPLE.COM", paths.HTTPD_ALIAS_DIR)
-    ca.configure_instance("catest.example.com", "example.com", "password", "password")
+    ca.configure_instance("catest.example.com", "password", "password")
diff --git a/ipaserver/install/dogtaginstance.py b/ipaserver/install/dogtaginstance.py
index e8d17cb22..0d60a19d0 100644
--- a/ipaserver/install/dogtaginstance.py
+++ b/ipaserver/install/dogtaginstance.py
@@ -119,7 +119,6 @@ class DogtagInstance(service.Service):
         self.dm_password = None
         self.admin_password = None
         self.fqdn = host_name
-        self.domain = None
         self.pkcs12_info = None
         self.clone = False
 
diff --git a/ipaserver/install/krainstance.py b/ipaserver/install/krainstance.py
index 48268b0be..485271b02 100644
--- a/ipaserver/install/krainstance.py
+++ b/ipaserver/install/krainstance.py
@@ -74,7 +74,7 @@ class KRAInstance(DogtagInstance):
         self.basedn = DN(('o', 'kra'), ('o', 'ipaca'))
         self.log = log_mgr.get_logger(self)
 
-    def configure_instance(self, realm_name, host_name, domain, dm_password,
+    def configure_instance(self, realm_name, host_name, dm_password,
                            admin_password, ds_port=DEFAULT_DSPORT,
                            pkcs12_info=None, master_host=None,
                            master_replication_port=None,
@@ -84,7 +84,6 @@ class KRAInstance(DogtagInstance):
            To create a clone, pass in pkcs12_info.
         """
         self.fqdn = host_name
-        self.domain = domain
         self.dm_password = dm_password
         self.admin_password = admin_password
         self.ds_port = ds_port
@@ -382,8 +381,7 @@ def install_replica_kra(config, postinstall=False):
     if _kra.is_installed():
         sys.exit("A KRA is already configured on this system.")
 
-    _kra.configure_instance(config.realm_name,
-                            config.host_name, config.domain_name,
+    _kra.configure_instance(config.realm_name, config.host_name,
                             config.dirman_password, config.dirman_password,
                             pkcs12_info=(krafile,),
                             master_host=config.master_host_name,