Commit bd3210aa authored by Jonathon Duerig's avatar Jonathon Duerig

Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel

parents ed2463f8 4e221789
...@@ -125,7 +125,7 @@ if os.path.exists( LOCALCONF ): ...@@ -125,7 +125,7 @@ if os.path.exists( LOCALCONF ):
if EXTRACONF and os.path.exists( EXTRACONF ): if EXTRACONF and os.path.exists( EXTRACONF ):
execfile( EXTRACONF ) execfile( EXTRACONF )
HOSTNAME = socket.getfqdn(socket.gethostname()) HOSTNAME = XMLRPC_SERVER[ "default" ]
DOMAIN = HOSTNAME[HOSTNAME.find('.')+1:] DOMAIN = HOSTNAME[HOSTNAME.find('.')+1:]
SLICEURN = "urn:publicid:IDN+" + DOMAIN + "+slice+" + SLICENAME SLICEURN = "urn:publicid:IDN+" + DOMAIN + "+slice+" + SLICENAME
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment