Re-add nova_dhcp_domain variable

It still makes sense to carry a variable for defining dns_domain
since deployers will be able to control them with single variable
for all services.

Closes-Bug: #1922703
Change-Id: I2be47100ce701e71dda2fe4e8ca58a7b6cad529c
This commit is contained in:
Dmitriy Rabotyagov 2021-04-06 15:20:17 +03:00
parent d354e1d1b7
commit ffd2823327
3 changed files with 12 additions and 0 deletions

View File

@ -187,6 +187,10 @@ nova_keystone_auth_plugin: password
## Nova enabled apis ## Nova enabled apis
nova_enabled_apis: "osapi_compute,metadata" nova_enabled_apis: "osapi_compute,metadata"
## Domain name used to configure FQDN for instances. When empty, only the hostname without
## a domain will be configured.
nova_dhcp_domain: "{{ dhcp_domain | default('') }}"
## Nova v2.1 ## Nova v2.1
nova_service_name: nova nova_service_name: nova
nova_service_type: compute nova_service_type: compute

View File

@ -0,0 +1,7 @@
---
features:
- |
Re-added ``nova_dhcp_domain`` variable that defaults to the
``dhcp_domain``. When set to empty string, only the hostname without
a domain will be configured for the instances.

View File

@ -273,6 +273,7 @@ secure_proxy_ssl_header = {{ nova_secure_proxy_ssl_header }}
[api] [api]
use_forwarded_for = {{ nova_network_services[nova_network_type]['use_forwarded_for'] | bool }} use_forwarded_for = {{ nova_network_services[nova_network_type]['use_forwarded_for'] | bool }}
vendordata_jsonfile_path = /etc/nova/vendor_data.json vendordata_jsonfile_path = /etc/nova/vendor_data.json
dhcp_domain = {{ nova_dhcp_domain }}
[scheduler] [scheduler]
workers = {{ nova_scheduler_workers | default(nova_api_threads) }} workers = {{ nova_scheduler_workers | default(nova_api_threads) }}