IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2024-12-25 08:21:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make request_service_keytab into a public method

Browse Source 
a cosmetic change: we had private method comprising of calls to public
ones, which did not make much sense in our case

https://fedorahosted.org/freeipa/ticket/6638

Reviewed-By: Martin Basti <mbasti@redhat.com>
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
This commit is contained in:
Martin Babinsky 2017-02-17 14:31:55 +01:00 committed by Martin Basti
parent af998c4d30
commit 6c0baa6208
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ipaserver/install/dsinstance.py
View File

@ -393,7 +393,7 @@ class DsInstance(service.Service):
self.__common_setup(enable_ssl=(not self.promote))
self.step("restarting directory server", self.__restart_instance)
self.step("creating DS keytab", self._request_service_keytab)
self.step("creating DS keytab", self.request_service_keytab)
if self.promote:
if self.pkcs12_info:
self.step("configuring TLS for DS instance", self.__enable_ssl)
@ -1221,8 +1221,8 @@ class DsInstance(service.Service):
if self.domainlevel is not None:
self._ldap_mod("domainlevel.ldif", self.sub_dict)
def _request_service_keytab(self):
super(DsInstance, self)._request_service_keytab()
def request_service_keytab(self):
super(DsInstance, self).request_service_keytab()
# Configure DS to use the keytab
vardict = {"KRB5_KTNAME": self.keytab}

2
ipaserver/install/httpinstance.py
View File

@ -166,7 +166,7 @@ class HTTPInstance(service.Service):
self.step("enabling mod_nss renegotiate", self.enable_mod_nss_renegotiate)
self.step("adding URL rewriting rules", self.__add_include)
self.step("configuring httpd", self.__configure_http)
self.step("setting up httpd keytab", self._request_service_keytab)
self.step("setting up httpd keytab", self.request_service_keytab)
self.step("retrieving anonymous keytab", self.request_anon_keytab)
self.step("configuring Gssproxy", self.configure_gssproxy)
self.step("setting up ssl", self.__setup_ssl)

2
ipaserver/install/service.py
View File

@ -588,7 +588,7 @@ class Service(object):
ipautil.run(args, nolog=nolog)
def _request_service_keytab(self):
def request_service_keytab(self):
if any(attr is None for attr in (self.principal, self.keytab)):
raise NotImplementedError(
"service must have defined principal "