diff options
| author | Michael Still <mikal@stillhq.com> | 2013-03-12 03:13:02 +1100 |
|---|---|---|
| committer | Michael Still <mikal@stillhq.com> | 2013-03-12 03:15:25 +1100 |
| commit | c8b240d74e9d050eb8770095e22174d1653be8f3 (patch) | |
| tree | d9f6273487bc43611a1b9f299b6663de76c20c9f /nova/compute | |
| parent | f543f347c84e7f5de2c584ca55363e4dee5b0a3d (diff) | |
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
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', |