From 7301812c9e32cde7ee145a1cbd18e8e76f52be37 Mon Sep 17 00:00:00 2001 From: Oliver Walsh Date: Wed, 2 Dec 2020 12:29:45 +0000 Subject: [PATCH] Allow both DEFAULT/dhcp_domain and api/dhcp_domain to be set Partial revert of If6a26527a737a7184ebddd5b4bc346d64827e9e3 to allow both/either config option to be used until it is clear what nova will take. Related-bug: #1903908 Change-Id: I98fe83e0c245388944529cd19b5e2bbed134e855 --- manifests/init.pp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 2904221f5..285e41545 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -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':