openstack
/
puppet-openstack-integration
Code Issues Proposed changes

Deprecate scenario.img_dir option 

The option is deprecated for more than 4 years already and it will
be removed soon, see the change in Tempest [1].

Starting Tempest 25.0.0 release, CONF.scenario.img_file need
a full path for the image. CONF.scenario.img_dir was deprecated
and will be removed in the next release. Till Tempest 25.0.0,
old behavior is maintained and keep working but starting
Tempest 26.0.0, you need to specify the full path in
CONF.scenario.img_file config option.

This patch does analogically the same change as was done in Tempest,
in order to give users of the plugin some time for removing img_dir.

[1] https://review.opendev.org/#/c/710996

Related-Bug: #1393881
Change-Id: I6f1377e5eb9e81c484795fc80341ca87d7b9ed04
This commit is contained in:
Martin Kopec 2020-07-14 08:29:40 +00:00
parent 64605e1273
commit c3db20f7fd
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/tempest.pp
View File

@ -257,7 +257,9 @@ class openstack_integration::tempest (
db_flavor_ref => '42',
image_ssh_user => 'cirros',
image_alt_ssh_user => 'cirros',
img_file => 'cirros-0.4.0-x86_64-disk.img',
# TODO(emilien) optimization by 1/ using Hiera to configure Glance image source
# and 2/ if running in the gate, use /home/jenkins/cache/files/ cirros image.
img_file => '/tmp/openstack/image/cirros-0.4.0-x86_64-disk.img',
compute_build_interval => 10,
ca_certificates_file => $::openstack_integration::params::ca_bundle_cert_path,
manage_tests_packages => true,
@ -267,10 +269,6 @@ class openstack_integration::tempest (
run_ssh => true,
l2gw_switch => $l2gw_switch,
disable_dashboard_ssl_validation => true,
# TODO(emilien) optimization by 1/ using Hiera to configure Glance image source
# and 2/ if running in the gate, use /home/jenkins/cache/files/ cirros image.
# img_dir => '/home/jenkins/cache/files',
img_dir => '/tmp/openstack/image',
baremetal_driver => 'fake-hardware',
baremetal_enabled_hardware_types => 'ipmi,fake-hardware',
ec2api_tester_roles => ['member'],