Skip to content
This repository has been archived by the owner on Feb 29, 2024. It is now read-only.

Commit

Permalink
Set toplevel nova::dhcp_domain for all nova services
Browse files Browse the repository at this point in the history
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 bf7ef6b)
(cherry picked from commit efd73e1)
(cherry picked from commit 5d62f66)
  • Loading branch information
olliewalsh authored and stuggi committed Mar 24, 2021
1 parent c3396e2 commit d5949fe
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion deployment/nova/nova-base-puppet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d5949fe

Please sign in to comment.