From 0d84833e9688e0df97f3d24e06025e512bca3ce3 Mon Sep 17 00:00:00 2001
From: Daniel Bengtsson <dbengt@redhat.com>
Date: Tue, 27 Apr 2021 12:19:47 +0200
Subject: [PATCH] Use the new type HostDomainOpt.

Use the new oslo.confg type HostDomainOpt to support underscore in the
name. You can see the bugzilla[1] to have more information.

[1] https://bugzilla.redhat.com/show_bug.cgi?id=1868940

Related-Bug: #1892044
Change-Id: Ib6c8fc1e3d90b79b10066c429670fcb957bddd23
---
 lower-constraints.txt | 2 +-
 nova/conf/libvirt.py  | 2 +-
 nova/conf/netconf.py  | 2 +-
 requirements.txt      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lower-constraints.txt b/lower-constraints.txt
index 5da03fd608..81b8f41f66 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -69,7 +69,7 @@ os-xenapi==0.3.4
 osc-lib==1.10.0
 oslo.cache==1.26.0
 oslo.concurrency==4.4.0
-oslo.config==6.8.0
+oslo.config==8.6.0
 oslo.context==3.1.1
 oslo.db==4.44.0
 oslo.i18n==5.0.1
diff --git a/nova/conf/libvirt.py b/nova/conf/libvirt.py
index 5d89dbe739..199cc6cf5e 100644
--- a/nova/conf/libvirt.py
+++ b/nova/conf/libvirt.py
@@ -235,7 +235,7 @@ Related options:
 * ``live_migration_uri``: If ``live_migration_uri`` value is not None, the
   scheme used for live migration is taken from ``live_migration_uri`` instead.
 """),
-    cfg.HostAddressOpt('live_migration_inbound_addr',
+    cfg.HostDomainOpt('live_migration_inbound_addr',
                        help="""
 IP address used as the live migration address for this host.
 
diff --git a/nova/conf/netconf.py b/nova/conf/netconf.py
index 69713bb741..ac1bc7a368 100644
--- a/nova/conf/netconf.py
+++ b/nova/conf/netconf.py
@@ -49,7 +49,7 @@ Related options:
 
 * my_ip - if my_block_storage_ip is not set, then my_ip value is used.
 """),
-    cfg.StrOpt("host",
+    cfg.HostDomainOpt("host",
         default=socket.gethostname(),
         sample_default='<current_hostname>',
         help="""
diff --git a/requirements.txt b/requirements.txt
index 1e84d66dc0..4c7f340794 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -33,7 +33,7 @@ stevedore>=1.20.0 # Apache-2.0
 websockify>=0.9.0 # LGPLv3
 oslo.cache>=1.26.0 # Apache-2.0
 oslo.concurrency>=4.4.0 # Apache-2.0
-oslo.config>=6.8.0 # Apache-2.0
+oslo.config>=8.6.0 # Apache-2.0
 oslo.context>=3.1.1 # Apache-2.0
 oslo.log>=4.4.0 # Apache-2.0
 oslo.reports>=1.18.0 # Apache-2.0