From c995438ca2b0cfb078bfd29e585d49fa8f6a693a Mon Sep 17 00:00:00 2001
From: Eric Harney <eharney@redhat.com>
Date: Wed, 25 Aug 2021 11:09:05 -0400
Subject: [PATCH] Change 'host' option from HostAddressOpt to StrOpt

HostAddressOpt is overly restrictive for this field --
it should actually just be a StrOpt.

Co-Author: Gorka Eguileor <geguileo@redhat.com>
Closes-Bug: #1941068
Change-Id: I7699433b283ba9aa1bd11da4f6ff4de071f1b51d
---
 cinder/common/config.py                              | 12 ++++++------
 ...rect-host-config-option-347e60f957458d54_new.yaml |  7 +++++++
 2 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 releasenotes/notes/incorrect-host-config-option-347e60f957458d54_new.yaml

diff --git a/cinder/common/config.py b/cinder/common/config.py
index 8f2fc414ca1..4108a4ff405 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 00000000000..236573fbc01
--- /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.