openstack/puppet-tripleo
Code Issues Proposed changes

Fix regression of Nova dhcp_domain handling

Browse Source 
As of https://review.opendev.org/774415
nova::metadata::dhcp_domain values in custom hiera
overrides stopped working for users.

As a result, during updates/upgrades, that might alter
existing hostnames for Nova compute nodes.

Fix regression by honoring legacy nova::metadata::dhcp_domain
alongside nova::dhcp_domain values.

Change-Id: I4889600be9f31532ac30d944bde28a64cff5ed26
Related: rhbz#2181566
Co-authored-by: Takashi Kajinami <tkajinam@redhat.com>
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
(cherry picked from commit 0d5139ee56)
This commit is contained in:
Bogdan Dobrelya 2023-04-24 12:51:47 +02:00
parent 68b4a7c87d
commit e60b46efd7
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/profile/base/nova.pp
View File

@ -171,6 +171,7 @@ class tripleo::profile::base::nova (
'password' => $oslomsg_notify_password,
'ssl' => $oslomsg_notify_use_ssl_real,
}),
dhcp_domain => hiera('nova::metadata::dhcp_domain', hiera('nova::dhcp_domain', '')),
}
include ::nova::placement
include ::nova::keystone::service_user