Revert changing to FQDN for hostnames.

5dd1553 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 5dd1553 separately.

Resolves bug 1151012.

Change-Id: I944f46d6eb2a6944a12833ec8de7afa2b18e66e7

nova/compute/manager.py

@@ -80,7 +80,7 @@
 
 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',

nova/console/manager.py

@@ -37,7 +37,7 @@
                 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'),
     ]
 

nova/netconf.py

@@ -48,7 +48,7 @@ def _get_my_ip():
                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 '