diff --git a/manifests/magnum.pp b/manifests/magnum.pp index 9a999278..5a0446ca 100644 --- a/manifests/magnum.pp +++ b/manifests/magnum.pp @@ -17,11 +17,11 @@ # # [*image_os_distro*] # (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*] # (Optional) The name of the image to be used for ClusterTemplate -# Defaults to 'fedora-atomic-latest' +# Defaults to 'fedora-coreos-latest' # # [*provision_flavors*] # (Optional) If ::tempest::magnum should configure the testing flavors @@ -79,8 +79,8 @@ class tempest::magnum ( Boolean $provision_image = true, Optional[String[1]] $image_source = undef, - String[1] $image_name = 'fedora-atomic-latest', - String[1] $image_os_distro = 'fedora-atomic', + String[1] $image_name = 'fedora-coreos-latest', + String[1] $image_os_distro = 'fedora-coreos', Boolean $provision_flavors = true, String[1] $flavor_id = 's1.magnum', String[1] $master_flavor_id = 'm1.magnum', diff --git a/spec/classes/tempest_magnum_spec.rb b/spec/classes/tempest_magnum_spec.rb index 3b7e96e1..e478d967 100644 --- a/spec/classes/tempest_magnum_spec.rb +++ b/spec/classes/tempest_magnum_spec.rb @@ -11,7 +11,7 @@ describe 'tempest::magnum' 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', } end @@ -19,15 +19,15 @@ describe 'tempest::magnum' do shared_examples 'tempest magnum' do context 'with default parameters' 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', - :source => 'https://fedorapeople.org/groups/magnum/fedora-atomic-latest.qcow2', - :properties => {'os_distro' => 'fedora-atomic'} + :source => 'https://fedorapeople.org/groups/magnum/fedora-coreos-latest.qcow2', + :properties => {'os_distro' => 'fedora-coreos'} ) 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_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/keypair_name').with_value('') is_expected.to contain_tempest_config('magnum/flavor_id').with_value('s1.magnum')