diff options
| author | Simo Sorce <ssorce@redhat.com> | 2007-12-11 11:00:24 -0500 |
|---|---|---|
| committer | Simo Sorce <ssorce@redhat.com> | 2007-12-11 11:00:24 -0500 |
| commit | 75493763f665970858b26dd06cdf36985fe61940 (patch) | |
| tree | 557b19af3dc59c8bcadfa57ca23bfa1dd43505a6 /ipa-server/ipaserver/dsinstance.py | |
| parent | 06140245660d4d68a155796418e80867ce853be4 (diff) | |
| parent | ca8e71d9381fb61368e5666c4d560ae9417fdf97 (diff) | |
| download | freeipa.git-75493763f665970858b26dd06cdf36985fe61940.tar.gz freeipa.git-75493763f665970858b26dd06cdf36985fe61940.tar.xz freeipa.git-75493763f665970858b26dd06cdf36985fe61940.zip | |
iMerge with upstream
Diffstat (limited to 'ipa-server/ipaserver/dsinstance.py')
| -rw-r--r-- | ipa-server/ipaserver/dsinstance.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ipa-server/ipaserver/dsinstance.py b/ipa-server/ipaserver/dsinstance.py index 08b86035..6ba721c3 100644 --- a/ipa-server/ipaserver/dsinstance.py +++ b/ipa-server/ipaserver/dsinstance.py @@ -125,6 +125,7 @@ class DsInstance(service.Service): self.host_name = None self.dm_password = None self.sub_dict = None + self.domain = None def create_instance(self, ds_user, realm_name, host_name, dm_password, ro_replica=False): self.ds_user = ds_user @@ -133,6 +134,7 @@ class DsInstance(service.Service): self.suffix = realm_to_suffix(self.realm_name) self.host_name = host_name self.dm_password = dm_password + self.domain = host_name[host_name.find(".")+1:] self.__setup_sub_dict() if ro_replica: @@ -173,7 +175,7 @@ class DsInstance(service.Service): self.sub_dict = dict(FQHN=self.host_name, SERVERID=self.serverid, PASSWORD=self.dm_password, SUFFIX=self.suffix.lower(), REALM=self.realm_name, USER=self.ds_user, - SERVER_ROOT=server_root) + SERVER_ROOT=server_root, DOMAIN=self.domain) def __create_ds_user(self): self.step("creating directory server user") |