Merge "Re-add nova_dhcp_domain variable"

This commit is contained in:
Zuul 2021-04-19 10:36:44 +00:00 committed by Gerrit Code Review
commit c2688515a8
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: "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_service_name: nova
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]
use_forwarded_for = {{ nova_network_services[nova_network_type]['use_forwarded_for'] | bool }}
vendordata_jsonfile_path = /etc/nova/vendor_data.json
dhcp_domain = {{ nova_dhcp_domain }}
[scheduler]
workers = {{ nova_scheduler_workers | default(nova_api_threads) }}