diff --git a/manifests/repo/redhat/redhat.pp b/manifests/repo/redhat/redhat.pp index ed7bfa8..ce0fc01 100644 --- a/manifests/repo/redhat/redhat.pp +++ b/manifests/repo/redhat/redhat.pp @@ -80,7 +80,7 @@ # # [*stream*] # (optional) Is this CentOS Stream and we should adjust mirrors thereafter. -# Defaults to false +# Defaults to true # class openstack_extras::repo::redhat::redhat( $release = $::openstack_extras::repo::redhat::params::release, @@ -98,7 +98,7 @@ class openstack_extras::repo::redhat::redhat( $manage_priorities = true, $centos_mirror_url = 'http://mirror.centos.org', $update_packages = false, - $stream = false, + $stream = true, ) inherits openstack_extras::repo::redhat::params { validate_legacy(String, 'validate_string', $release) diff --git a/releasenotes/notes/add-redhat-repo-stream-param-e07601e273aad56c.yaml b/releasenotes/notes/add-redhat-repo-stream-param-e07601e273aad56c.yaml index 6282ab8..38770c5 100644 --- a/releasenotes/notes/add-redhat-repo-stream-param-e07601e273aad56c.yaml +++ b/releasenotes/notes/add-redhat-repo-stream-param-e07601e273aad56c.yaml @@ -1,5 +1,5 @@ --- features: - | - Added ``stream`` parameter (defaulting to false) to the openstack_extras::repo::redhat::redhat - class that if set to true instructs Puppet to create repositories for CentOS Stream. + Added ``stream`` parameter (defaulting to true) to the openstack_extras::repo::redhat::redhat + class that instructs Puppet to create repositories for CentOS Stream. diff --git a/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb b/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb index 60a556b..be0a117 100644 --- a/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb +++ b/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb @@ -40,7 +40,7 @@ describe 'openstack_extras::repo::redhat::redhat' do end it { should contain_yumrepo('rdo-release').with( - :baseurl => "http://mirror.centos.org/centos/7/cloud/$basearch/openstack-victoria/", + :baseurl => "http://mirror.centos.org/centos/7-stream/cloud/$basearch/openstack-victoria/", :descr => 'OpenStack Victoria Repository', :gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud', :enabled => '1', @@ -51,8 +51,8 @@ describe 'openstack_extras::repo::redhat::redhat' do )} it { should contain_yumrepo('rdo-qemu-ev').with( - :baseurl => "http://mirror.centos.org/centos/7/virt/$basearch/kvm-common/", - :descr => 'RDO CentOS-7 - QEMU EV', + :baseurl => "http://mirror.centos.org/centos/7-stream/virt/$basearch/kvm-common/", + :descr => 'RDO CentOS-7-stream - QEMU EV', :gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization', :enabled => '1', :gpgcheck => '1', @@ -98,8 +98,8 @@ describe 'openstack_extras::repo::redhat::redhat' do end it { should contain_yumrepo('rdo-qemu-ev').with( - :baseurl => "http://mirror.centos.org/centos/8/virt/$basearch/advanced-virtualization/", - :descr => 'RDO CentOS-8 - QEMU EV', + :baseurl => "http://mirror.centos.org/centos/8-stream/virt/$basearch/advancedvirt-common/", + :descr => 'RDO CentOS-8-stream - QEMU EV', :gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization', :enabled => '1', :gpgcheck => '1', @@ -117,9 +117,9 @@ describe 'openstack_extras::repo::redhat::redhat' do it { should_not contain_exec('installing_yum-plugin-priorities') } end - context 'with major release 8 and stream set to true' do + context 'with major release 8 and stream is false' do let :params do - default_params.merge!( :stream => true ) + default_params.merge!( :stream => false ) end before do @@ -127,11 +127,11 @@ describe 'openstack_extras::repo::redhat::redhat' do end it { should contain_yumrepo('rdo-release').with( - :baseurl => "http://mirror.centos.org/centos/8-stream/cloud/$basearch/openstack-victoria/", + :baseurl => "http://mirror.centos.org/centos/8/cloud/$basearch/openstack-victoria/", )} it { should contain_yumrepo('rdo-qemu-ev').with( - :baseurl => "http://mirror.centos.org/centos/8-stream/virt/$basearch/advancedvirt-common/", + :baseurl => "http://mirror.centos.org/centos/8/virt/$basearch/advanced-virtualization/", )} end @@ -141,7 +141,7 @@ describe 'openstack_extras::repo::redhat::redhat' do end it { should contain_yumrepo('rdo-release').with( - :baseurl => "http://mirror.centos.org/centos/7/cloud/\$basearch/openstack-juno/", + :baseurl => "http://mirror.centos.org/centos/7-stream/cloud/\$basearch/openstack-juno/", :descr => 'OpenStack Juno Repository', :gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud' )} @@ -201,7 +201,7 @@ describe 'openstack_extras::repo::redhat::redhat' do end it { should contain_yumrepo('rdo-release').with( - :baseurl => "http://mirror.dfw.rax.openstack.org/centos/7/cloud/\$basearch/openstack-victoria/", + :baseurl => "http://mirror.dfw.rax.openstack.org/centos/7-stream/cloud/\$basearch/openstack-victoria/", :descr => 'OpenStack Victoria Repository', :gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud', :proxy => 'http://my.proxy.com:8000'