diff --git a/modules/enableit/common/manifests/system/repo.pp b/modules/enableit/common/manifests/system/repo.pp index 473df24aa..6e2cb52f7 100644 --- a/modules/enableit/common/manifests/system/repo.pp +++ b/modules/enableit/common/manifests/system/repo.pp @@ -254,24 +254,44 @@ noop_value => $noop_value, } } - - yumrepo { 'epel_local': - ensure => present, - noop => $noop_value, - enabled => 1, - gpgcheck => 1, - gpgkey => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-${_os_major}", - descr => "Extra Packages for Enterprise Linux ${_os_major} \$basearch", - baseurl => "https://${domain}/${_snapshot_uri_fragment}yum/epel/${_os_major}/\$basearch/", - target => '/etc/yum.repos.d/epel.repo', + } + if $_os['name'] == 'Rocky' { + ['BaseOS', 'AppStream', 'Extras'].each |$repo| { + yumrepo { $repo: + ensure => present, + noop => $noop_value, + enabled => 1, + gpgcheck => 1, + gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial', + descr => "Rocky Linux \$releasever - ${repo}", + baseurl => "https://${domain}/${_snapshot_uri_fragment}yum/rocky/${_os_major}/${repo}/\$basearch/", + target => '/etc/yum.repos.d/Rocky.repo', + } } - eit_repos::yum::gpgkey { 'epel_local': + eit_repos::yum::gpgkey { 'rockyofficial': ensure => present, - path => "/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-${_os_major}", - source => "puppet:///modules/eit_repos/yum/RPM-GPG-KEY-EPEL-${_os_major}", + path => '/etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial', + source => "puppet:///modules/eit_repos/yum/RPM-GPG-KEY-Rocky-${_os_major}", noop_value => $noop_value, } } + + yumrepo { 'epel_local': + ensure => present, + noop => $noop_value, + enabled => 1, + gpgcheck => 1, + gpgkey => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-${_os_major}", + descr => "Extra Packages for Enterprise Linux ${_os_major} \$basearch", + baseurl => "https://${domain}/${_snapshot_uri_fragment}yum/epel/${_os_major}/\$basearch/", + target => '/etc/yum.repos.d/epel.repo', + } + eit_repos::yum::gpgkey { 'epel_local': + ensure => present, + path => "/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-${_os_major}", + source => "puppet:///modules/eit_repos/yum/RPM-GPG-KEY-EPEL-${_os_major}", + noop_value => $noop_value, + } } 'Debian': { $_os_type = downcase($_os['distro']['id']) diff --git a/modules/enableit/eit_repos/files/yum/RPM-GPG-KEY-Rocky-8 b/modules/enableit/eit_repos/files/yum/RPM-GPG-KEY-Rocky-8 new file mode 100644 index 000000000..28ce769ce --- /dev/null +++ b/modules/enableit/eit_repos/files/yum/RPM-GPG-KEY-Rocky-8 @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBGAofzYBEAC6yS1azw6f3wmaVd//3aSy6O2c9+jeetulRQvg2LvhRRS1eNqp +/x9tbBhfohu/tlDkGpYHV7diePgMml9SZDy1sKlI3tDhx6GZ3xwF0fd1vWBZpmNk +D9gRkUmYBeLotmcXQZ8ZpWLicosFtDpJEYpLUhuIgTKwt4gxJrHvkWsGQiBkJxKD +u3/RlL4IYA3Ot9iuCBflc91EyAw1Yj0gKcDzbOqjvlGtS3ASXgxPqSfU0uLC9USF +uKDnP2tcnlKKGfj0u6VkqISliSuRAzjlKho9Meond+mMIFOTT6qp4xyu+9Dj3IjZ +IC6rBXRU3xi8z0qYptoFZ6hx70NV5u+0XUzDMXdjQ5S859RYJKijiwmfMC7gZQAf +OkdOcicNzen/TwD/slhiCDssHBNEe86Wwu5kmDoCri7GJlYOlWU42Xi0o1JkVltN +D8ZId+EBDIms7ugSwGOVSxyZs43q2IAfFYCRtyKHFlgHBRe9/KTWPUrnsfKxGJgC +Do3Yb63/IYTvfTJptVfhQtL1AhEAeF1I+buVoJRmBEyYKD9BdU4xQN39VrZKziO3 +hDIGng/eK6PaPhUdq6XqvmnsZ2h+KVbyoj4cTo2gKCB2XA7O2HLQsuGduHzYKNjf +QR9j0djjwTrsvGvzfEzchP19723vYf7GdcLvqtPqzpxSX2FNARpCGXBw9wARAQAB +tDNSZWxlYXNlIEVuZ2luZWVyaW5nIDxpbmZyYXN0cnVjdHVyZUByb2NreWxpbnV4 +Lm9yZz6JAk4EEwEIADgWIQRwUcRwqSn0VM6+N7cVr12sbXRaYAUCYCh/NgIbDwUL +CQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRAVr12sbXRaYLFmEACSMvoO1FDdyAbu +1m6xEzDhs7FgnZeQNzLZECv2j+ggFSJXezlNVOZ5I1I8umBan2ywfKQD8M+IjmrW +k9/7h9i54t8RS/RN7KNo7ECGnKXqXDPzBBTs1Gwo1WzltAoaDKUfXqQ4oJ4aCP/q +/XPVWEzgpJO1XEezvCq8VXisutyDiXEjjMIeBczxb1hbamQX+jLTIQ1MDJ4Zo1YP +zlUqrHW434XC2b1/WbSaylq8Wk9cksca5J+g3FqTlgiWozyy0uxygIRjb6iTzKXk +V7SYxeXp3hNTuoUgiFkjh5/0yKWCwx7aQqlHar9GjpxmBDAO0kzOlgtTw//EqTwR +KnYZLig9FW0PhwvZJUigr0cvs/XXTTb77z/i/dfHkrjVTTYenNyXogPtTtSyxqca +61fbPf0B/S3N43PW8URXBRS0sykpX4SxKu+PwKCqf+OJ7hMEVAapqzTt1q9T7zyB +QwvCVx8s7WWvXbs2d6ZUrArklgjHoHQcdxJKdhuRmD34AuXWCLW+gH8rJWZpuNl3 ++WsPZX4PvjKDgMw6YMcV7zhWX6c0SevKtzt7WP3XoKDuPhK1PMGJQqQ7spegGB+5 +DZvsJS48Ip0S45Qfmj82ibXaCBJHTNZE8Zs+rdTjQ9DS5qvzRA1sRA1dBb/7OLYE +JmeWf4VZyebm+gc50szsg6Ut2yT8hw== +=AiP8 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/modules/enableit/eit_repos/files/yum/RPM-GPG-KEY-Rocky-9 b/modules/enableit/eit_repos/files/yum/RPM-GPG-KEY-Rocky-9 new file mode 100644 index 000000000..6fb617c6b --- /dev/null +++ b/modules/enableit/eit_repos/files/yum/RPM-GPG-KEY-Rocky-9 @@ -0,0 +1,31 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: resf.keykeeper.v1 +Comment: Keykeeper + +xsFNBGJ5RksBEADF/Lzssm7uryV6+VHAgL36klyCVcHwvx9Bk853LBOuHVEZWsme +kbJF3fQG7i7gfCKGuV5XW15xINToe4fBThZteGJziboSZRpkEQ2z3lYcbg34X7+d +co833lkBNgz1v6QO7PmAdY/x76Q6Hx0J9yiJWd+4j+vRi4hbWuh64vUtTd7rPwk8 +0y3g4oK1YT0NR0Xm/QUO9vWmkSTVflQ6y82HhHIUrG+1vQnSOrWaC0O1lqUI3Nuo +b6jTARCmbaPsi+XVQnBbsnPPq6Tblwc+NYJSqj5d9nT0uEXT7Zovj4Je5oWVFXp9 +P1OWkbo2z5XkKjoeobM/zKDESJR78h+YQAN9IOKFjL/u/Gzrk1oEgByCABXOX+H5 +hfucrq5U3bbcKy4e5tYgnnZxqpELv3fN/2l8iZknHEh5aYNT5WXVHpD/8u2rMmwm +I9YTEMueEtmVy0ZV3opUzOlC+3ZUwjmvAJtdfJyeVW/VMy3Hw3Ih0Fij91rO613V +7n72ggVlJiX25jYyT4AXlaGfAOMndJNVgBps0RArOBYsJRPnvfHlLi5cfjVd7vYx +QhGX9ODYuvyJ/rW70dMVikeSjlBDKS08tvdqOgtiYy4yhtY4ijQC9BmCE9H9gOxU +FN297iLimAxr0EVsED96fP96TbDGILWsfJuxAvoqmpkElv8J+P1/F7to2QARAQAB +zU9Sb2NreSBFbnRlcnByaXNlIFNvZnR3YXJlIEZvdW5kYXRpb24gLSBSZWxlYXNl +IGtleSAyMDIyIDxyZWxlbmdAcm9ja3lsaW51eC5vcmc+wsGKBBMBCAA0BQJieUZL +FiEEIcslauFvxUxuZSlJcC1CbTUNJ10CGwMCHgECGQEDCwkHAhUIAxYAAgIiAQAK +CRBwLUJtNQ0nXWQ5D/9472seOyRO6//bQ2ns3w9lE+aTLlJ5CY0GSTb4xNuyv+AD +IXpgvLSMtTR0fp9GV3vMw6QIWsehDqt7O5xKWi+3tYdaXRpb1cvnh8r/oCcvI4uL +k8kImNgsx+Cj+drKeQo03vFxBTDi1BTQFkfEt32fA2Aw5gYcGElM717sNMAMQFEH +P+OW5hYDH4kcLbtUypPXFbcXUbaf6jUjfiEp5lLjqquzAyDPLlkzMr5RVa9n3/rI +R6OQp5loPVzCRZMgDLALBU2TcFXLVP+6hAW8qM77c+q/rOysP+Yd+N7GAd0fvEvA +mfeA4Y6dP0mMRu96EEAJ1qSKFWUul6K6nuqy+JTxktpw8F/IBAz44na17Tf02MJH +GCUWyM0n5vuO5kK+Ykkkwd+v43ZlqDnwG7akDkLwgj6O0QNx2TGkdgt3+C6aHN5S +MiF0pi0qYbiN9LO0e05Ai2r3zTFC/pCaBWlG1ph2jx1pDy4yUVPfswWFNfe5I+4i +CMHPRFsZNYxQnIA2Prtgt2YMwz3VIGI6DT/Z56Joqw4eOfaJTTQSXCANts/gD7qW +D3SZXPc7wQD63TpDEjJdqhmepaTECbxN7x/p+GwIZYWJN+AYhvrfGXfjud3eDu8/ +i+YIbPKH1TAOMwiyxC106mIL705p+ORf5zATZMyB8Y0OvRIz5aKkBDFZM2QN6A== +=PzIf +-----END PGP PUBLIC KEY BLOCK----- diff --git a/modules/enableit/eit_repos/manifests/init.pp b/modules/enableit/eit_repos/manifests/init.pp index 6b16e64bc..fb0e98253 100644 --- a/modules/enableit/eit_repos/manifests/init.pp +++ b/modules/enableit/eit_repos/manifests/init.pp @@ -117,6 +117,11 @@ } } + 'Rocky': { + class { 'yum': + manage_os_default_repos => $upstream, + } + } default: { fail("This ${distro_id} is not supported for upstream repos") } diff --git a/modules/enableit/repository/data/common.yaml b/modules/enableit/repository/data/common.yaml index 6bc7bc03e..868bbf2a5 100644 --- a/modules/enableit/repository/data/common.yaml +++ b/modules/enableit/repository/data/common.yaml @@ -154,6 +154,16 @@ repository::mirror::default_configurations: sections: ["prod"] repodir: "microsoft/yum" package_format: "rpm" + rocky: + yum: + enable: false + all: + enable: false + mirror_url: "https://dl.rockylinux.org/pub/rocky" + package_format: "rpm" + repodir: "yum/rocky" + architectures: ["x86_64"] + dists: ["8", "9"] ubuntu: apt: enable: false diff --git a/modules/enableit/repository/types/mirrors/configurations.pp b/modules/enableit/repository/types/mirrors/configurations.pp index 13bb6bd4a..383c6e171 100644 --- a/modules/enableit/repository/types/mirrors/configurations.pp +++ b/modules/enableit/repository/types/mirrors/configurations.pp @@ -3,6 +3,7 @@ 'ubuntu', 'ubuntu_arm64', 'epel', + 'rocky', 'docker', 'microsoft', 'jenkins',