openstack/puppet-tempest
Code Issues Proposed changes

Merge "tempest_glance_id_setter: autorequire glance_image resource"

Browse Source
This commit is contained in:
Zuul 2022-03-03 12:17:47 +00:00 committed by Gerrit Code Review
commit 8d4532dc4b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/puppet/type/tempest_glance_id_setter.rb
View File

@ -20,6 +20,10 @@ Puppet::Type.newtype(:tempest_glance_id_setter) do
desc 'name of glance image' desc 'name of glance image'
end end
autorequire(:glance_image) do
[self[:image_name]] if self[:image_name]
end
autorequire(:package) do autorequire(:package) do
['python-openstackclient', 'python3-openstackclient'] ['python-openstackclient', 'python3-openstackclient']
end end

2
manifests/init.pp
View File

@ -836,7 +836,6 @@ class tempest(
tempest_conf_path => $tempest_conf, tempest_conf_path => $tempest_conf,
image_name => $image_name, image_name => $image_name,
} }
Glance_image<||> -> Tempest_glance_id_setter['image_ref']
Tempest_config<||> -> Tempest_glance_id_setter['image_ref'] Tempest_config<||> -> Tempest_glance_id_setter['image_ref']
Keystone_user_role<||> -> Tempest_glance_id_setter['image_ref'] Keystone_user_role<||> -> Tempest_glance_id_setter['image_ref']
} elsif ($image_name and $image_ref) or (! $image_name and ! $image_ref) { } elsif ($image_name and $image_ref) or (! $image_name and ! $image_ref) {
@ -848,7 +847,6 @@ class tempest(
tempest_conf_path => $tempest_conf, tempest_conf_path => $tempest_conf,
image_name => $image_name_alt, image_name => $image_name_alt,
} }
Glance_image<||> -> Tempest_glance_id_setter['image_ref_alt']
Tempest_config<||> -> Tempest_glance_id_setter['image_ref_alt'] Tempest_config<||> -> Tempest_glance_id_setter['image_ref_alt']
Keystone_user_role<||> -> Tempest_glance_id_setter['image_ref_alt'] Keystone_user_role<||> -> Tempest_glance_id_setter['image_ref_alt']
} elsif ($image_name_alt and $image_ref_alt) or (! $image_name_alt and ! $image_ref_alt) { } elsif ($image_name_alt and $image_ref_alt) or (! $image_name_alt and ! $image_ref_alt) {