From 65f40aeb8d147e30f50d128ffc290169937b6d50 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Tue, 14 Feb 2012 09:48:32 -0500 Subject: Use FQDN in place of FQHN for consistency in sub_dict. For some reason lost to history the sub_dict in dsinstance and cainstance used FQHN instead of FQDN. This made upgrade scripts not work reliably as the variable might be different depending on context. Use FQDN universally instead. --- ipaserver/install/dsinstance.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ipaserver/install/dsinstance.py') diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py index 2fb749f1..c66f2a7f 100644 --- a/ipaserver/install/dsinstance.py +++ b/ipaserver/install/dsinstance.py @@ -100,7 +100,7 @@ def is_ds_running(server_id=''): INF_TEMPLATE = """ [General] -FullMachineName= $FQHN +FullMachineName= $FQDN SuiteSpotUserID= $USER SuiteSpotGroup= $GROUP ServerRoot= $SERVER_ROOT @@ -275,7 +275,7 @@ class DsInstance(service.Service): def __setup_sub_dict(self): server_root = find_server_root() - self.sub_dict = dict(FQHN=self.fqdn, SERVERID=self.serverid, + self.sub_dict = dict(FQDN=self.fqdn, SERVERID=self.serverid, PASSWORD=self.dm_password, RANDOM_PASSWORD=self.generate_random(), SUFFIX=self.suffix.lower(), -- cgit