diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-11 22:05:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-11 22:05:39 +0000 |
| commit | 2d7b7a10b672ede6aa04b42b2efce24c6459f699 (patch) | |
| tree | 5ac0ec36d019e95e1de99ce3d8e0b5cdc14bc28b /nova/compute | |
| parent | f5e30cf434eba64b415ee6c1d98111a198b4a7de (diff) | |
| parent | c8b240d74e9d050eb8770095e22174d1653be8f3 (diff) | |
Merge "Revert changing to FQDN for hostnames."
Diffstat (limited to 'nova/compute')
| -rwxr-xr-x | nova/compute/manager.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 338708f4e..5288ba6b9 100755 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -80,7 +80,7 @@ from nova import volume compute_opts = [ cfg.StrOpt('console_host', - default=socket.getfqdn(), + default=socket.gethostname(), help='Console proxy host to use to connect ' 'to instances on this host.'), cfg.StrOpt('default_access_ip_network_name', |