openstack
/
puppet-nova
Code Issues Proposed changes

Remove compabitility code for dhcp_domain 

We have completely remove dhcp_domain from nova::network::neutron,
so now we can safely remove compatibility code for it.

Change-Id: I8b9d810312b1c9f74331672b346d8a30a54f79cb
This commit is contained in:
Takashi Kajinami 2020-02-24 10:44:11 +09:00
parent c36e1f0519
commit 267ff94094
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/metadata.pp
View File

@ -71,20 +71,10 @@ and will be removed in the future. Please use the one ::nova::api.')
and will be removed in the future. Please use the one ::nova::api.')
}
# TODO(mwhahaha): backwards compatibility until we drop it from
# nova::network::network
if defined('$::nova::neutron::dhcp_domain') and $::nova::neutron::dhcp_domain != undef {
$dhcp_domain_real = $::nova::neutron::dhcp_domain
} else {
$dhcp_domain_real = $dhcp_domain
}
ensure_resource('nova_config', 'api/dhcp_domain', {
value => $dhcp_domain_real
})
nova_config {
'api/metadata_cache_expiration': value => $metadata_cache_expiration;
'api/local_metadata_per_cell': value => $local_metadata_per_cell;
'api/dhcp_domain': value => $dhcp_domain;
'api/metadata_cache_expiration': value => $metadata_cache_expiration;
'api/local_metadata_per_cell': value => $local_metadata_per_cell;
}
if ($neutron_metadata_proxy_shared_secret){