openstack
/
puppet-nova
Code Issues Proposed changes

Merge "Allow both DEFAULT/dhcp_domain and api/dhcp_domain to be set" into stable/victoria

This commit is contained in:
Zuul 2021-01-12 08:30:51 +00:00 committed by Gerrit Code Review
parent 3f4d157b81 7301812c9e
commit ba47f9844f
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/init.pp
View File

@ -647,8 +647,6 @@ but should be one of: ssh-rsa, ssh-dsa, ssh-ecdsa.")
nova_config { 'api/auth_strategy': value => $auth_strategy }
}
$dhcp_domain_real = pick($::nova::metadata::dhcp_domain, $dhcp_domain)
nova_config {
'DEFAULT/ssl_only': value => $ssl_only;
'DEFAULT/cert': value => $cert;
@ -660,7 +658,7 @@ but should be one of: ssh-rsa, ssh-dsa, ssh-ecdsa.")
'DEFAULT/cpu_allocation_ratio': value => $cpu_allocation_ratio;
'DEFAULT/ram_allocation_ratio': value => $ram_allocation_ratio;
'DEFAULT/disk_allocation_ratio': value => $disk_allocation_ratio;
'DEFAULT/dhcp_domain': value => $dhcp_domain_real;
'DEFAULT/dhcp_domain': value => $dhcp_domain;
}
oslo::messaging::rabbit {'nova_config':