diff options
| author | Martin Babinsky <mbabinsk@redhat.com> | 2017-02-17 14:31:55 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2017-02-22 18:50:30 +0100 |
| commit | 6c0baa6208c2bf97b5ed7ea6e9836963dced64b0 (patch) | |
| tree | a08ba09e72b0fc70678b73742a017898793a1cab /ipaserver | |
| parent | af998c4d30175fb3ecc148e1b3a7aca03ef9239a (diff) | |
| download | freeipa-6c0baa6208c2bf97b5ed7ea6e9836963dced64b0.tar.gz freeipa-6c0baa6208c2bf97b5ed7ea6e9836963dced64b0.tar.xz freeipa-6c0baa6208c2bf97b5ed7ea6e9836963dced64b0.zip | |
Make request_service_keytab into a public method
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>
Diffstat (limited to 'ipaserver')
| -rw-r--r-- | ipaserver/install/dsinstance.py | 6 | ||||
| -rw-r--r-- | ipaserver/install/httpinstance.py | 2 | ||||
| -rw-r--r-- | ipaserver/install/service.py | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py index 9172b65f3..bf80ae089 100644 --- a/ipaserver/install/dsinstance.py +++ b/ipaserver/install/dsinstance.py @@ -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} diff --git a/ipaserver/install/httpinstance.py b/ipaserver/install/httpinstance.py index 6383e27e3..435130b31 100644 --- a/ipaserver/install/httpinstance.py +++ b/ipaserver/install/httpinstance.py @@ -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) diff --git a/ipaserver/install/service.py b/ipaserver/install/service.py index 80bb4bbe1..837880f3a 100644 --- a/ipaserver/install/service.py +++ b/ipaserver/install/service.py @@ -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 " |