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.
This commit is contained in:
Rob Crittenden
2012-02-14 09:48:32 -05:00
parent cf35dfa2bc
commit 65f40aeb8d
4 changed files with 7 additions and 7 deletions

View File

@@ -77,7 +77,7 @@ TOMCAT_SERVER_PORT=9701
# information
INF_TEMPLATE = """
[General]
FullMachineName= $FQHN
FullMachineName= $FQDN
SuiteSpotUserID= $USER
SuiteSpotGroup= $GROUP
ServerRoot= $SERVER_ROOT
@@ -266,7 +266,7 @@ class CADSInstance(service.Service):
def __setup_sub_dict(self):
server_root = dsinstance.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, SUFFIX=self.suffix.lower(),
REALM=self.realm_name, USER=PKI_DS_USER,
SERVER_ROOT=server_root, DOMAIN=self.domain,