diff options
| author | Zuul <zuul@review.opendev.org> | 2021-09-17 15:59:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-09-17 15:59:45 +0000 |
| commit | cf8e6be8aa763cc3ab505a3c4a7ab93b33ecb2c6 (patch) | |
| tree | ce3850f4a8199d4cd77e9177834b9ef3c9ac43f1 | |
| parent | 02b1b7a9cb47fc6f8a9dda1f8576348424cdd042 (diff) | |
| parent | 8e48b4ded983956a7426e63435c1d7a91bccbe47 (diff) | |
| download | cinder-cf8e6be8aa763cc3ab505a3c4a7ab93b33ecb2c6.tar.gz | |
Merge "Change 'host' option from HostAddressOpt to StrOpt" into stable/victoria
| -rw-r--r-- | cinder/common/config.py | 12 | ||||
| -rw-r--r-- | releasenotes/notes/incorrect-host-config-option-347e60f957458d54_new.yaml | 7 |
2 files changed, 13 insertions, 6 deletions
diff --git a/cinder/common/config.py b/cinder/common/config.py index e4304fa91..4d2bea23d 100644 --- a/cinder/common/config.py +++ b/cinder/common/config.py @@ -84,12 +84,12 @@ global_opts = [ cfg.StrOpt('scheduler_manager', default='cinder.scheduler.manager.SchedulerManager', help='Full class name for the Manager for scheduler'), - cfg.HostAddressOpt('host', - sample_default='localhost', - default=socket.gethostname(), - help='Name of this node. This can be an opaque ' - 'identifier. It is not necessarily a host name, ' - 'FQDN, or IP address.'), + cfg.StrOpt('host', + sample_default='localhost', + default=socket.gethostname(), + help='Name of this node. This can be an opaque ' + 'identifier. It is not necessarily a host name, ' + 'FQDN, or IP address.'), # NOTE(vish): default to nova for compatibility with nova installs cfg.StrOpt('storage_availability_zone', default='nova', diff --git a/releasenotes/notes/incorrect-host-config-option-347e60f957458d54_new.yaml b/releasenotes/notes/incorrect-host-config-option-347e60f957458d54_new.yaml new file mode 100644 index 000000000..236573fbc --- /dev/null +++ b/releasenotes/notes/incorrect-host-config-option-347e60f957458d54_new.yaml @@ -0,0 +1,7 @@ +--- +fixes: + - | + `Bug #1941068 <https://bugs.launchpad.net/cinder/+bug/1941068>`_: Fixed + type of the ``host`` configuration option. It was limited to valid FQDN + values when we document that it isn't. This may result in the + ``cinder-manage db sync`` command failing. |