diff -Nru puppet-module-openstack-extras-20.3.0/debian/changelog puppet-module-openstack-extras-21.0.0/debian/changelog --- puppet-module-openstack-extras-20.3.0/debian/changelog 2022-04-05 12:05:51.000000000 +0000 +++ puppet-module-openstack-extras-21.0.0/debian/changelog 2022-10-20 21:42:57.000000000 +0000 @@ -1,3 +1,9 @@ +puppet-module-openstack-extras (21.0.0-1) unstable; urgency=medium + + * New upstream release. + + -- Thomas Goirand Thu, 20 Oct 2022 23:42:57 +0200 + puppet-module-openstack-extras (20.3.0-1) unstable; urgency=medium * New upstream release. diff -Nru puppet-module-openstack-extras-20.3.0/manifests/repo/debian/debian.pp puppet-module-openstack-extras-21.0.0/manifests/repo/debian/debian.pp --- puppet-module-openstack-extras-20.3.0/manifests/repo/debian/debian.pp 2022-03-29 08:40:46.000000000 +0000 +++ puppet-module-openstack-extras-21.0.0/manifests/repo/debian/debian.pp 2022-10-05 04:07:42.000000000 +0000 @@ -40,12 +40,6 @@ # (optional) Debian package repository location. # Defaults to "http://${::lsbdistcodename}-${release}.debian.net/debian" # -# === DEPRECATED -# -# [*manage_whz*] -# (optional) Whether or not to add the default Debian Stretch APT source -# Replaced by $manage_deb. -# class openstack_extras::repo::debian::debian( $release = $::openstack_extras::repo::debian::params::release, $manage_deb = true, @@ -55,16 +49,11 @@ $source_hash = {}, $source_defaults = {}, $deb_location = "http://${::lsbdistcodename}-${release}.debian.net/debian", - # DEPRECATED - $manage_whz = undef, ) inherits openstack_extras::repo::debian::params { - # handle deprecation - $deb_manage = pick($manage_whz, $manage_deb) $lowercase_release = downcase($release) - - if $deb_manage { + if $manage_deb { if $use_extrepo { # Extrepo is much nicer than what's below, because diff -Nru puppet-module-openstack-extras-20.3.0/manifests/repo/debian/params.pp puppet-module-openstack-extras-21.0.0/manifests/repo/debian/params.pp --- puppet-module-openstack-extras-20.3.0/manifests/repo/debian/params.pp 2022-03-29 08:40:46.000000000 +0000 +++ puppet-module-openstack-extras-21.0.0/manifests/repo/debian/params.pp 2022-10-05 04:07:42.000000000 +0000 @@ -4,7 +4,7 @@ # class openstack_extras::repo::debian::params { - $release = 'xena' + $release = 'yoga' $uca_name = 'ubuntu-cloud-archive' $uca_location = 'http://ubuntu-cloud.archive.canonical.com/ubuntu' diff -Nru puppet-module-openstack-extras-20.3.0/manifests/repo/redhat/params.pp puppet-module-openstack-extras-21.0.0/manifests/repo/redhat/params.pp --- puppet-module-openstack-extras-20.3.0/manifests/repo/redhat/params.pp 2022-03-29 08:40:46.000000000 +0000 +++ puppet-module-openstack-extras-21.0.0/manifests/repo/redhat/params.pp 2022-10-05 04:07:42.000000000 +0000 @@ -4,7 +4,9 @@ # OS family repo classes. # class openstack_extras::repo::redhat::params { - $release = 'xena' + $release = 'yoga' + + $centos_mirror_url = 'http://mirror.stream.centos.org' $repo_defaults = { 'enabled' => '1', diff -Nru puppet-module-openstack-extras-20.3.0/manifests/repo/redhat/redhat.pp puppet-module-openstack-extras-21.0.0/manifests/repo/redhat/redhat.pp --- puppet-module-openstack-extras-20.3.0/manifests/repo/redhat/redhat.pp 2022-03-29 08:40:46.000000000 +0000 +++ puppet-module-openstack-extras-21.0.0/manifests/repo/redhat/redhat.pp 2022-10-05 04:07:42.000000000 +0000 @@ -14,11 +14,6 @@ # RDO OpenStack repository. # Defaults to true # -# [*manage_virt*] -# (Optional) Whether to create a yumrepo resource for the -# Advanced Virtualization repository. -# Defaults to true -# # [*manage_epel*] # (Optional) Whether to create a predefined yumrepo resource for # the EPEL repository. Note EPEL is not required for deploying @@ -63,29 +58,28 @@ # # [*centos_mirror_url*] # (Optional) URL of CentOS mirror. -# Defaults to 'http://mirror.centos.org' +# Defaults to $openstack_extras::repo::redhat::params::centos_mirror_url # # [*update_packages*] # (Optional) Whether to update all packages after yum repositories are # configured. # Defaults to false # -# [*stream*] -# (Optional) Is this CentOS Stream and should we adjust mirrors. -# Defaults to true -# # DEPRECATED PARAMS # ================= # -# [*manage_priorities*] -# (Optional) Whether to install yum-plugin-priorities package so -# 'priority' value in yumrepo will be effective. +# [*stream*] +# (Optional) Is this CentOS Stream and should we adjust mirrors. +# Defaults to undef +# +# [*manage_virt*] +# (Optional) Whether to create a yumrepo resource for the +# Advanced Virtualization repository. # Defaults to undef # class openstack_extras::repo::redhat::redhat ( $release = $openstack_extras::repo::redhat::params::release, $manage_rdo = true, - $manage_virt = true, $manage_epel = false, $repo_hash = {}, $repo_source_hash = {}, @@ -95,11 +89,11 @@ $gpgkey_defaults = {}, $purge_unmanaged = false, $package_require = false, - $centos_mirror_url = 'http://mirror.centos.org', + $centos_mirror_url = $openstack_extras::repo::redhat::params::centos_mirror_url, $update_packages = false, - $stream = true, # DEPRECATED PARAMS - $manage_priorities = undef, + $stream = undef, + $manage_virt = undef, ) inherits openstack_extras::repo::redhat::params { validate_legacy(String, 'validate_string', $release) @@ -114,26 +108,27 @@ validate_legacy(Boolean, 'validate_bool', $package_require) validate_yum_hash($repo_hash) - if $manage_priorities != undef { - warning('openstack_extras::repo::redhat::redhat::manage_priorities parameter is deprecated and will be removed') + if $stream != undef { + warning('The stream parmeter has been deprecated and has no effect.') + } + + if $manage_virt != undef { + warning('The manage_virt parameter has been deprecatd and has no effect.') } $_repo_defaults = merge($openstack_extras::repo::redhat::params::repo_defaults, $repo_defaults) $_gpgkey_defaults = merge($openstack_extras::repo::redhat::params::gpgkey_defaults, $gpgkey_defaults) - $centos_major = $stream ? { - true => "${facts['os']['release']['major']}-stream", - default => $facts['os']['release']['major'] - } - anchor { 'openstack_extras_redhat': } if $manage_rdo { $release_cap = capitalize($release) + $rdo_baseurl = "${centos_mirror_url}/SIGs/\$stream/cloud/\$basearch/openstack-${release}/" + $rdo_hash = { 'rdo-release' => { - 'baseurl' => "${centos_mirror_url}/centos/${centos_major}/cloud/\$basearch/openstack-${release}/", + 'baseurl' => $rdo_baseurl, 'descr' => "OpenStack ${release_cap} Repository", 'gpgkey' => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud', } @@ -158,43 +153,12 @@ } } - if $manage_virt { - if $stream { - $virt_baseurl = "${centos_mirror_url}/centos/${centos_major}/virt/\$basearch/advancedvirt-common/" - } else { - $virt_baseurl = "${centos_mirror_url}/centos/${centos_major}/virt/\$basearch/advanced-virtualization/" - } - - # TODO(tobias-urdin): Remove this after one cycle. - yumrepo { 'rdo-qemu-ev': - ensure => 'absent', - } - - $virt_hash = { - 'centos-advanced-virt' => { - 'baseurl' => $virt_baseurl, - 'descr' => "CentOS-${$centos_major} - Advanced Virt", - 'gpgkey' => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization', - } - } - - $virtkey_hash = { - '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization' => { - 'source' => 'puppet:///modules/openstack_extras/RPM-GPG-KEY-CentOS-SIG-Virtualization' - } - } - - create_resources('file', $virtkey_hash, $_gpgkey_defaults) - create_resources('yumrepo', $virt_hash, $_repo_defaults) - - # NOTE(tobias-urdin): This was introduced in yumrepo_core 1.0.7 which is - # included from 6.15.0 and forward (also since 7.0.0). - # TODO(tobias-urdin): Should set this by default when we only support Puppet 7. - if versioncmp($::puppetversion, '6.15.0') >= 0 { - Yumrepo<| title == 'centos-advanced-virt' |> { - module_hotfixes => true, - } - } + # NOTE(tkajinam): Ensure the advanced-virt repository is purged + file { '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization': + ensure => absent + } + yumrepo { 'centos-advanced-virt': + ensure => 'absent' } if $manage_epel { diff -Nru puppet-module-openstack-extras-20.3.0/metadata.json puppet-module-openstack-extras-21.0.0/metadata.json --- puppet-module-openstack-extras-20.3.0/metadata.json 2022-03-29 08:40:46.000000000 +0000 +++ puppet-module-openstack-extras-21.0.0/metadata.json 2022-10-05 04:07:42.000000000 +0000 @@ -3,11 +3,11 @@ "dependencies": [ { "name": "puppetlabs/apt", - "version_requirement": ">=1.8.0 <4.0.0" + "version_requirement": ">=1.8.0 <10.0.0" }, { "name": "puppet/corosync", - "version_requirement": ">=5.0.0 <6.0.0" + "version_requirement": ">=5.0.0 <9.0.0" }, { "name": "puppetlabs/stdlib", @@ -55,5 +55,5 @@ ], "source": "https://opendev.org/openstack/puppet-openstack_extras.git", "summary": "Puppet OpenStack Extras Module", - "version": "20.3.0" + "version": "21.0.0" } diff -Nru puppet-module-openstack-extras-20.3.0/releasenotes/notes/bug-1969484-6e4864f8bcc56230.yaml puppet-module-openstack-extras-21.0.0/releasenotes/notes/bug-1969484-6e4864f8bcc56230.yaml --- puppet-module-openstack-extras-20.3.0/releasenotes/notes/bug-1969484-6e4864f8bcc56230.yaml 1970-01-01 00:00:00.000000000 +0000 +++ puppet-module-openstack-extras-21.0.0/releasenotes/notes/bug-1969484-6e4864f8bcc56230.yaml 2022-10-05 04:07:42.000000000 +0000 @@ -0,0 +1,5 @@ +--- +fixes: + - | + The advanced virtualization repository is no longer enabled in CentOS + Stream 9, because the separate repository is no longer available. diff -Nru puppet-module-openstack-extras-20.3.0/releasenotes/notes/bug-1978332-8b223e30a7f30165.yaml puppet-module-openstack-extras-21.0.0/releasenotes/notes/bug-1978332-8b223e30a7f30165.yaml --- puppet-module-openstack-extras-20.3.0/releasenotes/notes/bug-1978332-8b223e30a7f30165.yaml 1970-01-01 00:00:00.000000000 +0000 +++ puppet-module-openstack-extras-21.0.0/releasenotes/notes/bug-1978332-8b223e30a7f30165.yaml 2022-10-05 04:07:42.000000000 +0000 @@ -0,0 +1,5 @@ +--- +fixes: + - | + The ``openstack_extras::repos::redhat::redhat`` class now configures RDO + repository properly in CentOS Stream 9. diff -Nru puppet-module-openstack-extras-20.3.0/releasenotes/notes/repo-debian-remove-manage_whz-73b1326b754dfe30.yaml puppet-module-openstack-extras-21.0.0/releasenotes/notes/repo-debian-remove-manage_whz-73b1326b754dfe30.yaml --- puppet-module-openstack-extras-20.3.0/releasenotes/notes/repo-debian-remove-manage_whz-73b1326b754dfe30.yaml 1970-01-01 00:00:00.000000000 +0000 +++ puppet-module-openstack-extras-21.0.0/releasenotes/notes/repo-debian-remove-manage_whz-73b1326b754dfe30.yaml 2022-10-05 04:07:42.000000000 +0000 @@ -0,0 +1,5 @@ +--- +upgrade: + - | + The ``openstack_extras::repo::debian::debian::manage_whz`` parameter has + been removed. diff -Nru puppet-module-openstack-extras-20.3.0/releasenotes/notes/repo-redhat-deprecate-manage_virt-4a29a4b85390b4fc.yaml puppet-module-openstack-extras-21.0.0/releasenotes/notes/repo-redhat-deprecate-manage_virt-4a29a4b85390b4fc.yaml --- puppet-module-openstack-extras-20.3.0/releasenotes/notes/repo-redhat-deprecate-manage_virt-4a29a4b85390b4fc.yaml 1970-01-01 00:00:00.000000000 +0000 +++ puppet-module-openstack-extras-21.0.0/releasenotes/notes/repo-redhat-deprecate-manage_virt-4a29a4b85390b4fc.yaml 2022-10-05 04:07:42.000000000 +0000 @@ -0,0 +1,5 @@ +--- +deprecations: + - | + The ``openstack_extras::repo::redhat::redhat::manage_virt`` parameter has + been deprecated and has no effect now. diff -Nru puppet-module-openstack-extras-20.3.0/releasenotes/notes/repo-redhat-deprecate-stream-04b111eabe5d5df3.yaml puppet-module-openstack-extras-21.0.0/releasenotes/notes/repo-redhat-deprecate-stream-04b111eabe5d5df3.yaml --- puppet-module-openstack-extras-20.3.0/releasenotes/notes/repo-redhat-deprecate-stream-04b111eabe5d5df3.yaml 1970-01-01 00:00:00.000000000 +0000 +++ puppet-module-openstack-extras-21.0.0/releasenotes/notes/repo-redhat-deprecate-stream-04b111eabe5d5df3.yaml 2022-10-05 04:07:42.000000000 +0000 @@ -0,0 +1,5 @@ +--- +deprecations: + - | + The ``openstack_extras::repo::redhat::redhat::stream`` parameter has been + deprecate. diff -Nru puppet-module-openstack-extras-20.3.0/releasenotes/notes/repo-redhat-remove-manage_priorities-019ec005d1f98c46.yaml puppet-module-openstack-extras-21.0.0/releasenotes/notes/repo-redhat-remove-manage_priorities-019ec005d1f98c46.yaml --- puppet-module-openstack-extras-20.3.0/releasenotes/notes/repo-redhat-remove-manage_priorities-019ec005d1f98c46.yaml 1970-01-01 00:00:00.000000000 +0000 +++ puppet-module-openstack-extras-21.0.0/releasenotes/notes/repo-redhat-remove-manage_priorities-019ec005d1f98c46.yaml 2022-10-05 04:07:42.000000000 +0000 @@ -0,0 +1,5 @@ +--- +upgrade: + - | + The ``openstack_extras::repo::redhat::redhat::manage_priorities`` parameter + has been removed. diff -Nru puppet-module-openstack-extras-20.3.0/releasenotes/source/index.rst puppet-module-openstack-extras-21.0.0/releasenotes/source/index.rst --- puppet-module-openstack-extras-20.3.0/releasenotes/source/index.rst 2022-03-29 08:40:46.000000000 +0000 +++ puppet-module-openstack-extras-21.0.0/releasenotes/source/index.rst 2022-10-05 04:07:42.000000000 +0000 @@ -9,6 +9,7 @@ :maxdepth: 2 unreleased + yoga xena wallaby victoria diff -Nru puppet-module-openstack-extras-20.3.0/releasenotes/source/yoga.rst puppet-module-openstack-extras-21.0.0/releasenotes/source/yoga.rst --- puppet-module-openstack-extras-20.3.0/releasenotes/source/yoga.rst 1970-01-01 00:00:00.000000000 +0000 +++ puppet-module-openstack-extras-21.0.0/releasenotes/source/yoga.rst 2022-10-05 04:07:42.000000000 +0000 @@ -0,0 +1,6 @@ +========================= +Yoga Series Release Notes +========================= + +.. release-notes:: + :branch: stable/yoga diff -Nru puppet-module-openstack-extras-20.3.0/spec/classes/openstack_extras_repo_debian_debian_spec.rb puppet-module-openstack-extras-21.0.0/spec/classes/openstack_extras_repo_debian_debian_spec.rb --- puppet-module-openstack-extras-20.3.0/spec/classes/openstack_extras_repo_debian_debian_spec.rb 2022-03-29 08:40:46.000000000 +0000 +++ puppet-module-openstack-extras-21.0.0/spec/classes/openstack_extras_repo_debian_debian_spec.rb 2022-10-05 04:07:42.000000000 +0000 @@ -14,7 +14,7 @@ let :paramclass_defaults do { - :release => 'xena' + :release => 'yoga' } end @@ -23,11 +23,11 @@ end context 'with default params' do - it { should contain_exec('/usr/bin/extrepo enable openstack_xena').with( + it { should contain_exec('/usr/bin/extrepo enable openstack_yoga').with( :command => "/bin/true # comment to satisfy puppet syntax requirements apt-get update apt-get install -y extrepo -extrepo enable openstack_xena +extrepo enable openstack_yoga apt-get update ", )} @@ -58,14 +58,14 @@ end it { should contain_apt__source('debian-openstack-backports').with( - :location => 'http://stretch-xena.debian.net/debian', - :release => 'stretch-xena-backports', + :location => 'http://stretch-yoga.debian.net/debian', + :release => 'stretch-yoga-backports', :repos => 'main', )} it { should contain_apt__source('debian-openstack-backports-nochange').with( - :location => 'http://stretch-xena.debian.net/debian', - :release => 'stretch-xena-backports-nochange', + :location => 'http://stretch-yoga.debian.net/debian', + :release => 'stretch-yoga-backports-nochange', :repos => 'main' )} diff -Nru puppet-module-openstack-extras-20.3.0/spec/classes/openstack_extras_repo_debian_ubuntu_spec.rb puppet-module-openstack-extras-21.0.0/spec/classes/openstack_extras_repo_debian_ubuntu_spec.rb --- puppet-module-openstack-extras-20.3.0/spec/classes/openstack_extras_repo_debian_ubuntu_spec.rb 2022-03-29 08:40:46.000000000 +0000 +++ puppet-module-openstack-extras-21.0.0/spec/classes/openstack_extras_repo_debian_ubuntu_spec.rb 2022-10-05 04:07:42.000000000 +0000 @@ -13,7 +13,7 @@ let :paramclass_defaults do { - :release => 'xena' + :release => 'yoga' } end @@ -28,7 +28,7 @@ it { should contain_apt__source('ubuntu-cloud-archive').with( :location => 'http://ubuntu-cloud.archive.canonical.com/ubuntu', - :release => 'trusty-updates/xena', + :release => 'trusty-updates/yoga', :repos => 'main', )} @@ -127,7 +127,7 @@ it { should contain_apt__source('ubuntu-cloud-archive').with( :location => 'http://mirror.dfw.rax.openstack.org/ubuntu-cloud-archive', - :release => 'trusty-proposed/xena', + :release => 'trusty-proposed/yoga', :repos => 'main', )} end diff -Nru puppet-module-openstack-extras-20.3.0/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb puppet-module-openstack-extras-21.0.0/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb --- puppet-module-openstack-extras-20.3.0/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb 2022-03-29 08:40:46.000000000 +0000 +++ puppet-module-openstack-extras-21.0.0/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb 2022-10-05 04:07:42.000000000 +0000 @@ -12,10 +12,9 @@ :mode => '0644', :before => 'Anchor[openstack_extras_redhat]', )} - it { should contain_yumrepo('rdo-release').with( - :baseurl => "http://mirror.centos.org/centos/#{facts[:operatingsystemmajrelease]}-stream/cloud/$basearch/openstack-xena/", - :descr => "OpenStack Xena Repository", + :baseurl => "http://mirror.stream.centos.org/SIGs/$stream/cloud/$basearch/openstack-yoga/", + :descr => "OpenStack Yoga Repository", :gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud', :enabled => '1', :gpgcheck => '1', @@ -25,27 +24,12 @@ :require => 'Anchor[openstack_extras_redhat]', )} - it { should contain_yumrepo('rdo-qemu-ev').with_ensure('absent') } - it { should contain_file('/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization').with( - :source => 'puppet:///modules/openstack_extras/RPM-GPG-KEY-CentOS-SIG-Virtualization', - :owner => 'root', - :group => 'root', - :mode => '0644', - :before => 'Anchor[openstack_extras_redhat]', - )} - + :ensure => 'absent' + ) } it { should contain_yumrepo('centos-advanced-virt').with( - :baseurl => "http://mirror.centos.org/centos/#{facts[:operatingsystemmajrelease]}-stream/virt/$basearch/advancedvirt-common/", - :descr => "CentOS-#{facts[:operatingsystemmajrelease]}-stream - Advanced Virt", - :gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization', - :enabled => '1', - :gpgcheck => '1', - :mirrorlist => 'absent', - :module_hotfixes => true, - :notify => 'Exec[yum_refresh]', - :require => 'Anchor[openstack_extras_redhat]', - )} + :ensure => 'absent' + ) } it { should_not contain_file("/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-#{facts[:operatingsystemmajrelease]}") } it { should_not contain_yumrepo('epel') } @@ -60,22 +44,10 @@ it { should_not contain_exec('yum_update') } end - context 'with default parameters but puppetversion < 6.15.0' do - before do - facts.merge!( :puppetversion => '6.14.0' ) - end - - it { - should contain_yumrepo('rdo-release').without_module_hotfixes - should contain_yumrepo('centos-advanced-virt').without_module_hotfixes - } - end - context 'with parameters' do let :params do { :manage_rdo => false, - :manage_virt => false, :manage_epel => true, :purge_unmanaged => true, :package_require => true, @@ -88,9 +60,6 @@ it { should_not contain_file('/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud') } it { should_not contain_yumrepo('rdo-release') } - it { should_not contain_file('/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization') } - it { should_not contain_yumrepo('centos-advanced-virt') } - it { should contain_file("/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-#{facts[:operatingsystemmajrelease]}").with( :source => "puppet:///modules/openstack_extras/RPM-GPG-KEY-EPEL-#{facts[:operatingsystemmajrelease]}", :owner => 'root', @@ -125,36 +94,119 @@ )} end - context 'with stream is false' do + context 'with overridden release' do let :params do { - :manage_rdo => true, - :manage_virt => true, - :stream => false, + :release => 'juno', + :manage_rdo => true, } end it { should contain_yumrepo('rdo-release').with( - :baseurl => "http://mirror.centos.org/centos/#{facts[:operatingsystemmajrelease]}/cloud/\$basearch/openstack-xena/", + :baseurl => "http://mirror.stream.centos.org/SIGs/$stream/cloud/$basearch/openstack-juno/", + :descr => 'OpenStack Juno Repository', )} + end - it { should contain_yumrepo('centos-advanced-virt').with( - :baseurl => "http://mirror.centos.org/centos/#{facts[:operatingsystemmajrelease]}/virt/\$basearch/advanced-virtualization/", - :descr => "CentOS-#{facts[:operatingsystemmajrelease]} - Advanced Virt", + context 'with default parameters but puppetversion < 6.15.0' do + before do + facts.merge!( :puppetversion => '6.14.0' ) + end + + it { + should contain_yumrepo('rdo-release').without_module_hotfixes + } + end + + context 'with centos_mirror_url' do + let :params do + { + :manage_rdo => true, + :centos_mirror_url => 'http://foo.bar', + } + end + + it { should contain_yumrepo('rdo-release').with( + :baseurl => "http://foo.bar/SIGs/$stream/cloud/$basearch/openstack-yoga/", )} end - context 'with overridden release' do + context 'with repo_defaults and gpgkey_defaults' do let :params do { - :release => 'juno', - :manage_rdo => true, + :manage_rdo => true, + :manage_epel => true, + :repo_hash => { + 'CentOS-Example' => { + 'baseurl' => 'http://example.com/$releasever/os/$basearch/', + 'descr' => 'CentOS-$releasever - Example', + 'gpgkey' => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Example', + }, + }, + :gpgkey_hash => { + '/etc/pki/rpm-gpg/RPM-GPG-KEY-Example' => { + 'source' => 'puppet:///modules/openstack_extras/RPM-GPG-KEY-Example', + } + }, + :repo_defaults => { + 'proxy' => 'http://example.com:8000', + }, + :gpgkey_defaults => { + 'owner' => 'steve', + 'force' => true, + }, } end + it { should contain_file('/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud').with( + :owner => 'steve', + :group => 'root', + :mode => '0644', + :force => true, + :before => 'Anchor[openstack_extras_redhat]', + )} + it { should contain_yumrepo('rdo-release').with( - :baseurl => "http://mirror.centos.org/centos/#{facts[:operatingsystemmajrelease]}-stream/cloud/\$basearch/openstack-juno/", - :descr => 'OpenStack Juno Repository', + :enabled => '1', + :gpgcheck => '1', + :mirrorlist => 'absent', + :proxy => 'http://example.com:8000', + :notify => 'Exec[yum_refresh]', + :require => 'Anchor[openstack_extras_redhat]', + )} + + it { should contain_file("/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-#{facts[:operatingsystemmajrelease]}").with( + :owner => 'steve', + :group => 'root', + :mode => '0644', + :force => true, + :before => 'Anchor[openstack_extras_redhat]', + )} + + it { should contain_yumrepo('epel').with( + :enabled => '1', + :gpgcheck => '1', + :mirrorlist => 'absent', + :proxy => 'http://example.com:8000', + :notify => 'Exec[yum_refresh]', + :require => 'Anchor[openstack_extras_redhat]', + )} + + it { should contain_yumrepo('CentOS-Example').with( + :enabled => '1', + :gpgcheck => '1', + :mirrorlist => 'absent', + :proxy => 'http://example.com:8000', + :notify => 'Exec[yum_refresh]', + :require => 'Anchor[openstack_extras_redhat]', + )} + + it { should contain_file('/etc/pki/rpm-gpg/RPM-GPG-KEY-Example').with( + :owner => 'steve', + :group => 'root', + :mode => '0644', + :force => true, + :before => 'Anchor[openstack_extras_redhat]', )} end @@ -254,121 +306,6 @@ :notify => 'Exec[yum_refresh]', )} end - - context 'with centos_mirror_url' do - let :params do - { - :manage_rdo => true, - :manage_virt => true, - :centos_mirror_url => 'http://foo.bar', - } - end - - it { should contain_yumrepo('rdo-release').with( - :baseurl => "http://foo.bar/centos/#{facts[:operatingsystemmajrelease]}-stream/cloud/\$basearch/openstack-xena/", - )} - - it { should contain_yumrepo('centos-advanced-virt').with( - :baseurl => "http://foo.bar/centos/#{facts[:operatingsystemmajrelease]}-stream/virt/\$basearch/advancedvirt-common/", - )} - end - - context 'with repo_defaults and gpgkey_defaults' do - let :params do - { - :manage_rdo => true, - :manage_virt => true, - :manage_epel => true, - :repo_hash => { - 'CentOS-Example' => { - 'baseurl' => 'http://example.com/$releasever/os/$basearch/', - 'descr' => 'CentOS-$releasever - Example', - 'gpgkey' => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Example', - }, - }, - :gpgkey_hash => { - '/etc/pki/rpm-gpg/RPM-GPG-KEY-Example' => { - 'source' => 'puppet:///modules/openstack_extras/RPM-GPG-KEY-Example', - } - }, - :repo_defaults => { - 'proxy' => 'http://example.com:8000', - }, - :gpgkey_defaults => { - 'owner' => 'steve', - 'force' => true, - }, - } - end - - it { should contain_file('/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud').with( - :owner => 'steve', - :group => 'root', - :mode => '0644', - :force => true, - :before => 'Anchor[openstack_extras_redhat]', - )} - - it { should contain_yumrepo('rdo-release').with( - :enabled => '1', - :gpgcheck => '1', - :mirrorlist => 'absent', - :proxy => 'http://example.com:8000', - :notify => 'Exec[yum_refresh]', - :require => 'Anchor[openstack_extras_redhat]', - )} - - it { should contain_file('/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization').with( - :owner => 'steve', - :group => 'root', - :mode => '0644', - :force => true, - :before => 'Anchor[openstack_extras_redhat]', - )} - - it { should contain_yumrepo('centos-advanced-virt').with( - :enabled => '1', - :gpgcheck => '1', - :mirrorlist => 'absent', - :proxy => 'http://example.com:8000', - :notify => 'Exec[yum_refresh]', - :require => 'Anchor[openstack_extras_redhat]', - )} - - it { should contain_file("/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-#{facts[:operatingsystemmajrelease]}").with( - :owner => 'steve', - :group => 'root', - :mode => '0644', - :force => true, - :before => 'Anchor[openstack_extras_redhat]', - )} - - it { should contain_yumrepo('epel').with( - :enabled => '1', - :gpgcheck => '1', - :mirrorlist => 'absent', - :proxy => 'http://example.com:8000', - :notify => 'Exec[yum_refresh]', - :require => 'Anchor[openstack_extras_redhat]', - )} - - it { should contain_yumrepo('CentOS-Example').with( - :enabled => '1', - :gpgcheck => '1', - :mirrorlist => 'absent', - :proxy => 'http://example.com:8000', - :notify => 'Exec[yum_refresh]', - :require => 'Anchor[openstack_extras_redhat]', - )} - - it { should contain_file('/etc/pki/rpm-gpg/RPM-GPG-KEY-Example').with( - :owner => 'steve', - :group => 'root', - :mode => '0644', - :force => true, - :before => 'Anchor[openstack_extras_redhat]', - )} - end end on_supported_os({