From c8b240d74e9d050eb8770095e22174d1653be8f3 Mon Sep 17 00:00:00 2001 From: Michael Still Date: Tue, 12 Mar 2013 03:13:02 +1100 Subject: Revert changing to FQDN for hostnames. 5dd1553cca7f7e62eebce75e1d936fc211b239ec moved to using a FQDN for host names. This caused bug 1151012, but Russell and I also believe the change will break the host column on the instances table. I can't do a plain old git revert for this change because a lot of the code has moved after this change. Revert to using just the hostname (no domain), and we'll revisit the intent of 5dd1553cca7f7e62eebce75e1d936fc211b239ec separately. Resolves bug 1151012. Change-Id: I944f46d6eb2a6944a12833ec8de7afa2b18e66e7 --- nova/console/manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nova/console') diff --git a/nova/console/manager.py b/nova/console/manager.py index 32fa75261..bd606a6ff 100644 --- a/nova/console/manager.py +++ b/nova/console/manager.py @@ -37,7 +37,7 @@ console_manager_opts = [ default=False, help='Stub calls to compute worker for tests'), cfg.StrOpt('console_public_hostname', - default=socket.getfqdn(), + default=socket.gethostname(), help='Publicly visible name for this console host'), ] -- cgit