summaryrefslogtreecommitdiffstats
path: root/nova/console
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-03-11 22:05:39 +0000
committerGerrit Code Review <review@openstack.org>2013-03-11 22:05:39 +0000
commit2d7b7a10b672ede6aa04b42b2efce24c6459f699 (patch)
tree5ac0ec36d019e95e1de99ce3d8e0b5cdc14bc28b /nova/console
parentf5e30cf434eba64b415ee6c1d98111a198b4a7de (diff)
parentc8b240d74e9d050eb8770095e22174d1653be8f3 (diff)
Merge "Revert changing to FQDN for hostnames."
Diffstat (limited to 'nova/console')
-rw-r--r--nova/console/manager.py2
1 files changed, 1 insertions, 1 deletions
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'),
]