fe594a6197
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
63 lines
2.1 KiB
Python
63 lines
2.1 KiB
Python
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
|
|
# Copyright 2010 United States Government as represented by the
|
|
# Administrator of the National Aeronautics and Space Administration.
|
|
# All Rights Reserved.
|
|
# Copyright 2012 Red Hat, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import socket
|
|
|
|
from oslo.config import cfg
|
|
|
|
CONF = cfg.CONF
|
|
|
|
|
|
def _get_my_ip():
|
|
"""
|
|
Returns the actual ip of the local machine.
|
|
|
|
This code figures out what source address would be used if some traffic
|
|
were to be sent out to some well known address on the Internet. In this
|
|
case, a Google DNS server is used, but the specific address does not
|
|
matter much. No traffic is actually sent.
|
|
"""
|
|
try:
|
|
csock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
|
|
csock.connect(('8.8.8.8', 80))
|
|
(addr, port) = csock.getsockname()
|
|
csock.close()
|
|
return addr
|
|
except socket.error:
|
|
return "127.0.0.1"
|
|
|
|
|
|
netconf_opts = [
|
|
cfg.StrOpt('my_ip',
|
|
default=_get_my_ip(),
|
|
help='ip address of this host'),
|
|
cfg.StrOpt('host',
|
|
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 '
|
|
'an AMQP key, and if using ZeroMQ, a valid '
|
|
'hostname, FQDN, or IP address'),
|
|
cfg.BoolOpt('use_ipv6',
|
|
default=False,
|
|
help='use ipv6'),
|
|
]
|
|
|
|
CONF.register_opts(netconf_opts)
|