From d5949fe862a3deeea1bba02d4d45571a85dceb41 Mon Sep 17 00:00:00 2001 From: Oliver Walsh Date: Wed, 2 Dec 2020 12:39:51 +0000 Subject: [PATCH] Set toplevel nova::dhcp_domain for all nova services Setting nova::metadata::dhcp_domain will no longer work unless nova::metadata is included. Since I07caa3185427b48e6e7d60965fa3e6157457018c we no longer include nova::metadata on computes. So we must now set nova::dhcp_domain in nova-base instead of relying on the deprecated nova::metadata::dhcp_domain param. Conflicts: deployment/nova/nova-base-puppet.yaml Closes-bug: #1905418 Depends-on: I98fe83e0c245388944529cd19b5e2bbed134e855 Change-Id: Iaf7823ea8d456008c1f4a3d7631657faa65eb6d3 (cherry picked from commit bf7ef6b4d7c05e2c6a71138f68ba970f6604f743) (cherry picked from commit efd73e15d0835e1e6d42ce79e422817de0007ceb) (cherry picked from commit 5d62f66429e4023e5b00202de7efda1f701176a0) --- deployment/nova/nova-base-puppet.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/nova/nova-base-puppet.yaml b/deployment/nova/nova-base-puppet.yaml index 2d0c7c98d7..7c54bff6c7 100644 --- a/deployment/nova/nova-base-puppet.yaml +++ b/deployment/nova/nova-base-puppet.yaml @@ -292,7 +292,7 @@ outputs: nova::network::neutron::neutron_project_name: 'service' nova::network::neutron::neutron_username: 'neutron' nova::network::neutron::neutron_region_name: {get_param: KeystoneRegion} - nova::metadata::dhcp_domain: '' + nova::dhcp_domain: '' nova::network::neutron::neutron_password: {get_param: NeutronPassword} nova::network::neutron::neutron_auth_url: {get_param: [EndpointMap, KeystoneV3Internal, uri]} nova::rabbit_heartbeat_timeout_threshold: 60