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 | |
| parent | f5e30cf434eba64b415ee6c1d98111a198b4a7de (diff) | |
| parent | c8b240d74e9d050eb8770095e22174d1653be8f3 (diff) | |
| download | nova-2d7b7a10b672ede6aa04b42b2efce24c6459f699.tar.gz nova-2d7b7a10b672ede6aa04b42b2efce24c6459f699.tar.xz nova-2d7b7a10b672ede6aa04b42b2efce24c6459f699.zip | |
Merge "Revert changing to FQDN for hostnames."
| -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 ' |