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 | |
| parent | f543f347c84e7f5de2c584ca55363e4dee5b0a3d (diff) | |
| download | nova-c8b240d74e9d050eb8770095e22174d1653be8f3.tar.gz nova-c8b240d74e9d050eb8770095e22174d1653be8f3.tar.xz nova-c8b240d74e9d050eb8770095e22174d1653be8f3.zip | |
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
| -rwxr-xr-x | nova/compute/manager.py | 2 | ||||
| -rw-r--r-- | nova/console/manager.py | 2 | ||||
| -rw-r--r-- | nova/netconf.py | 2 |
3 files changed, 3 insertions, 3 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', 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'), ] diff --git a/nova/netconf.py b/nova/netconf.py index f8116ed97..78939d586 100644 --- a/nova/netconf.py +++ b/nova/netconf.py @@ -48,7 +48,7 @@ netconf_opts = [ default=_get_my_ip(), help='ip address of this host'), cfg.StrOpt('host', - default=socket.getfqdn(), + default=socket.gethostname(), help='Name of this node. This can be an opaque identifier. ' 'It is not necessarily a hostname, FQDN, or IP address. ' 'However, the node name must be valid within ' |