openstack
/
puppet-tempest
Code Issues Proposed changes

magnum: Deprecate tempest_config_file 

... because we deprecated the same parameter of the tempest class.

Related-Bug: #2043210
Change-Id: I87c1db9a9d5297da4f5a716faa44f0228203893d
This commit is contained in:
Takashi Kajinami 2024-04-20 23:19:57 +09:00
parent 24853f714e
commit e976d8d862
2 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
manifests/magnum.pp
View File

@ -6,9 +6,6 @@
#
# === Parameters
#
# [*tempest_config_file*]
# Defaults to '/var/lib/tempest/etc/tempest.conf'
#
# [*provision_image*]
# (Optional) If ::tempest::magnum should configure the testing image
# Defaults to true
@ -61,24 +58,34 @@
# (Optional) DNS nameserver to use for ClusterTemplate
# Defaults to '8.8.8.8'
#
# DEPRECATED PARAMETERS
#
# [*tempest_config_file*]
# Defaults to undef
#
class tempest::magnum (
Stdlib::Absolutepath $tempest_config_file = '/var/lib/tempest/etc/tempest.conf',
Boolean $provision_image = true,
String[1] $image_source = 'https://fedorapeople.org/groups/magnum/fedora-atomic-latest.qcow2',
String[1] $image_name = 'fedora-atomic-latest',
String[1] $image_os_distro = 'fedora-atomic',
Boolean $provision_flavors = true,
String[1] $flavor_id = 's1.magnum',
String[1] $master_flavor_id = 'm1.magnum',
Boolean $provision_keypair = false,
$keypair_id = 'default',
$nic_id = 'public',
$magnum_url = undef,
$copy_logs = true,
$dns_nameserver = '8.8.8.8',
Boolean $provision_image = true,
String[1] $image_source = 'https://fedorapeople.org/groups/magnum/fedora-atomic-latest.qcow2',
String[1] $image_name = 'fedora-atomic-latest',
String[1] $image_os_distro = 'fedora-atomic',
Boolean $provision_flavors = true,
String[1] $flavor_id = 's1.magnum',
String[1] $master_flavor_id = 'm1.magnum',
Boolean $provision_keypair = false,
$keypair_id = 'default',
$nic_id = 'public',
$magnum_url = undef,
$copy_logs = true,
$dns_nameserver = '8.8.8.8',
# DEPRECATED PARAMETERS
$tempest_config_file = undef,
) {
include tempest::params
if $tempest_config_file != undef {
warning('The tempest_config_file parameter has been deprecated and has no effect')
}
if $provision_image {
$image_properties = { 'os_distro' => $image_os_distro }
glance_image { $image_name:
@ -117,10 +124,6 @@ class tempest::magnum (
}
}
Tempest_config {
path => $tempest_config_file,
}
tempest_config {
'magnum/image_id': value => $image_name;
'magnum/nic_id': value => $nic_id;

5
releasenotes/notes/deprecate-magnum-tempest_config_file-7d3344abfe895815.yaml Normal file
View File

@ -0,0 +1,5 @@
---
deprecations:
- |
The ``tempest::magnum::tempest_config_file`` parameter is deprecated and
has no effect now.