diff options
| -rw-r--r-- | ipaserver/install/dsinstance.py | 3 | ||||
| -rw-r--r-- | ipaserver/install/installutils.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py index c980ebf4e..16b274bcf 100644 --- a/ipaserver/install/dsinstance.py +++ b/ipaserver/install/dsinstance.py @@ -1203,7 +1203,8 @@ class DsInstance(service.Service): installutils.install_service_keytab(self.principal, self.master_fqdn, - paths.DS_KEYTAB) + paths.DS_KEYTAB, + force_service_add=True) # Configure DS to use the keytab vardict = {"KRB5_KTNAME": paths.DS_KEYTAB} diff --git a/ipaserver/install/installutils.py b/ipaserver/install/installutils.py index 5cad05dd4..aadb8e22b 100644 --- a/ipaserver/install/installutils.py +++ b/ipaserver/install/installutils.py @@ -1108,7 +1108,7 @@ def enable_and_start_oddjobd(sstore): root_logger.critical("Unable to start oddjobd: {0}".format(str(e))) -def install_service_keytab(principal, server, path): +def install_service_keytab(principal, server, path, force_service_add=False): try: api.Backend.rpcclient.connect() @@ -1121,6 +1121,7 @@ def install_service_keytab(principal, server, path): api.Backend.rpcclient.forward( 'service_add', krbprincipalname=principal, + force=force_service_add, version=u'2.112' # All the way back to 3.0 servers ) except errors.DuplicateEntry: |