openstack/puppet-tempest
Code Issues Proposed changes

magnum: Update default image name

Browse Source 
Fedora Atomic Host was replaced by Fedora CoreOS long time ago, and
the default value of image options in magnum-tempest-plugin were
updated accordingly[1].

[1] d75cbd1e48107bda05776e06a64f894963dfd8db

Change-Id: I2d3b471130013971315747e4ab09cdaa6bedd7e3
This commit is contained in:
Takashi Kajinami
2024-12-10 11:55:04 +09:00
parent 22ddf9ff29
commit 44b2551cc8
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/magnum.pp
View File

@@ -17,11 +17,11 @@
# #
# [*image_os_distro*] # [*image_os_distro*]
# (Optional) If provision_image is true, the os_distro propery of the image # (Optional) If provision_image is true, the os_distro propery of the image
# Defaults to fedora-atomic-latest # Defaults to fedora-coreos-latest
# #
# [*image_name*] # [*image_name*]
# (Optional) The name of the image to be used for ClusterTemplate # (Optional) The name of the image to be used for ClusterTemplate
# Defaults to 'fedora-atomic-latest' # Defaults to 'fedora-coreos-latest'
# #
# [*provision_flavors*] # [*provision_flavors*]
# (Optional) If ::tempest::magnum should configure the testing flavors # (Optional) If ::tempest::magnum should configure the testing flavors
@@ -79,8 +79,8 @@
class tempest::magnum ( class tempest::magnum (
Boolean $provision_image = true, Boolean $provision_image = true,
Optional[String[1]] $image_source = undef, Optional[String[1]] $image_source = undef,
String[1] $image_name = 'fedora-atomic-latest', String[1] $image_name = 'fedora-coreos-latest',
String[1] $image_os_distro = 'fedora-atomic', String[1] $image_os_distro = 'fedora-coreos',
Boolean $provision_flavors = true, Boolean $provision_flavors = true,
String[1] $flavor_id = 's1.magnum', String[1] $flavor_id = 's1.magnum',
String[1] $master_flavor_id = 'm1.magnum', String[1] $master_flavor_id = 'm1.magnum',

10
spec/classes/tempest_magnum_spec.rb
View File

@@ -11,7 +11,7 @@ describe 'tempest::magnum' do
let :params do let :params do
{ {
:image_source => 'https://fedorapeople.org/groups/magnum/fedora-atomic-latest.qcow2', :image_source => 'https://fedorapeople.org/groups/magnum/fedora-coreos-latest.qcow2',
:nic_id => 'b2e6021a-4956-4a1f-8329-790b9add05a9', :nic_id => 'b2e6021a-4956-4a1f-8329-790b9add05a9',
} }
end end
@@ -19,15 +19,15 @@ describe 'tempest::magnum' do
shared_examples 'tempest magnum' do shared_examples 'tempest magnum' do
context 'with default parameters' do context 'with default parameters' do
it 'provisions resources and configures tempest for magnum' do it 'provisions resources and configures tempest for magnum' do
is_expected.to contain_glance_image('fedora-atomic-latest').with( is_expected.to contain_glance_image('fedora-coreos-latest').with(
:ensure => 'present', :ensure => 'present',
:source => 'https://fedorapeople.org/groups/magnum/fedora-atomic-latest.qcow2', :source => 'https://fedorapeople.org/groups/magnum/fedora-coreos-latest.qcow2',
:properties => {'os_distro' => 'fedora-atomic'} :properties => {'os_distro' => 'fedora-coreos'}
) )
is_expected.to contain_nova_flavor('s1.magnum').with_ensure('present') is_expected.to contain_nova_flavor('s1.magnum').with_ensure('present')
is_expected.to contain_nova_flavor('m1.magnum').with_ensure('present') is_expected.to contain_nova_flavor('m1.magnum').with_ensure('present')
is_expected.to contain_tempest_config('magnum/image_id').with_value('fedora-atomic-latest') is_expected.to contain_tempest_config('magnum/image_id').with_value('fedora-coreos-latest')
is_expected.to contain_tempest_config('magnum/nic_id').with_value('b2e6021a-4956-4a1f-8329-790b9add05a9') is_expected.to contain_tempest_config('magnum/nic_id').with_value('b2e6021a-4956-4a1f-8329-790b9add05a9')
is_expected.to contain_tempest_config('magnum/keypair_name').with_value('<SERVICE DEFAULT>') is_expected.to contain_tempest_config('magnum/keypair_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('magnum/flavor_id').with_value('s1.magnum') is_expected.to contain_tempest_config('magnum/flavor_id').with_value('s1.magnum')