openstack/masakari-monitors
Code Issues Proposed changes

Use hostname to avoid clash with section

Browse Source 
Switch to using 'hostname' rather than 'host' to specify the
Hostname, FQDN or IP address of this host. This is to avoid a
clash with a section of the same name *1

*1 https://github.com/openstack/masakari-monitors/blob/master/masakarimonitors/conf/host.py#L87

Change-Id: I7d95b063c2eabbd8893857b5e1e7d342db0aebec
Closes-Bug: #1866660
This commit is contained in:
Liam Young 2020-03-09 17:04:50 +00:00
parent b717be163e
commit 8cb4de9e65
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
masakarimonitors/conf/service.py
View File

@ -17,8 +17,9 @@ import socket
from oslo_config import cfg from oslo_config import cfg
service_opts = [ service_opts = [
cfg.StrOpt('host', cfg.StrOpt('hostname',
default=socket.gethostname(), default=socket.gethostname(),
deprecated_name="host",
help=''' help='''
Hostname, FQDN or IP address of this host. Must be valid within AMQP key. Hostname, FQDN or IP address of this host. Must be valid within AMQP key.

2
masakarimonitors/manager.py
View File

@ -55,7 +55,7 @@ class Manager(PeriodicTasks):
def __init__(self, host=None, service_name='undefined'): def __init__(self, host=None, service_name='undefined'):
if not host: if not host:
host = CONF.host host = CONF.hostname
self.host = host self.host = host
self.service_name = service_name self.service_name = service_name
super(Manager, self).__init__() super(Manager, self).__init__()

4
masakarimonitors/service.py
View File

@ -69,13 +69,13 @@ class Service(service.Service):
def create(cls, host=None, binary=None, manager=None): def create(cls, host=None, binary=None, manager=None):
"""Instantiates class and passes back application object. """Instantiates class and passes back application object.
:param host: defaults to CONF.host :param host: defaults to CONF.hostname
:param binary: defaults to basename of executable :param binary: defaults to basename of executable
:param manager: defaults to CONF.<Latter part of binary>_manager :param manager: defaults to CONF.<Latter part of binary>_manager
""" """
if not host: if not host:
host = CONF.host host = CONF.hostname
if not binary: if not binary:
binary = os.path.basename(sys.argv[0]) binary = os.path.basename(sys.argv[0])

11
releasenotes/notes/bug-1866660-ef8624f5283b2e5e.yaml Normal file
View File

@ -0,0 +1,11 @@
---
features:
- |
A 'hostname' option has been added to the Masakari monitors configuration
file which replaces the 'host' option. The option should be used to specify
the Hostname, FQDN or IP address of the host.
deprecations:
- |
The 'host' option in the 'DEFAULT' section has been deprecated as it
clashes with the name of a section in the same file. It has been replaced
by the 'hostname' option.