diff --git a/hieradata/os/AlmaLinux/all_releases.yaml b/hieradata/os/AlmaLinux/all_releases.yaml index 47c116d..21e51ad 100644 --- a/hieradata/os/AlmaLinux/all_releases.yaml +++ b/hieradata/os/AlmaLinux/all_releases.yaml @@ -62,3 +62,206 @@ profiles::yum::global::repos: gpgkey: https://git.query.consul/api/packages/unkinben/rpm/repository.key gpgcheck: false mirrorlist: absent + + # Additional repositories - default to absent, roles can override with ensure: present + # FRRouting repositories + frr-extras: + ensure: absent + name: frr-extras + descr: frr-extras repository + target: /etc/yum.repos.d/frr-extras.repo + baseurl: https://packagerepo.service.consul/frr/el9/extras-daily/%{facts.os.architecture}/os + gpgkey: https://packagerepo.service.consul/frr/el9/extras-daily/%{facts.os.architecture}/os/RPM-GPG-KEY-FRR + mirrorlist: absent + frr-stable: + ensure: absent + name: frr-stable + descr: frr-stable repository + target: /etc/yum.repos.d/frr-stable.repo + baseurl: https://packagerepo.service.consul/frr/el9/stable-daily/%{facts.os.architecture}/os + gpgkey: https://packagerepo.service.consul/frr/el9/stable-daily/%{facts.os.architecture}/os/RPM-GPG-KEY-FRR + mirrorlist: absent + + # PostgreSQL repositories + postgresql-15: + ensure: absent + name: postgresql-15 + descr: postgresql-15 repository + target: /etc/yum.repos.d/postgresql.repo + baseurl: https://packagerepo.service.consul/postgresql/rhel%{facts.os.release.major}/15-daily/%{facts.os.architecture}/os + gpgkey: https://packagerepo.service.consul/postgresql/rhel%{facts.os.release.major}/15-daily/%{facts.os.architecture}/os/PGDG-RPM-GPG-KEY-RHEL + postgresql-17: + ensure: absent + name: postgresql-17 + descr: postgresql-17 repository + target: /etc/yum.repos.d/postgresql.repo + baseurl: https://packagerepo.service.consul/postgresql/rhel%{facts.os.release.major}/17-daily/%{facts.os.architecture}/os + gpgkey: https://packagerepo.service.consul/postgresql/rhel%{facts.os.release.major}/17-daily/%{facts.os.architecture}/os/PGDG-RPM-GPG-KEY-RHEL + postgresql-common: + ensure: absent + name: postgresql-common + descr: postgresql-common repository + target: /etc/yum.repos.d/postgresql.repo + baseurl: https://packagerepo.service.consul/postgresql/rhel%{facts.os.release.major}/common-daily/%{facts.os.architecture}/os + gpgkey: https://packagerepo.service.consul/postgresql/rhel%{facts.os.release.major}/common-daily/%{facts.os.architecture}/os/PGDG-RPM-GPG-KEY-RHEL + + # Ceph repositories + ceph: + ensure: absent + name: ceph + descr: ceph repository + target: /etc/yum.repos.d/ceph.repo + baseurl: https://packagerepo.service.consul/ceph/reef/rhel%{facts.os.release.major}/x86_64/ + gpgkey: https://packagerepo.service.consul/ceph/reef/rhel%{facts.os.release.major}/x86_64/repodata/repomd.xml.key + gpgcheck: 1 + mirrorlist: absent + ceph-noarch: + ensure: absent + name: ceph-noarch + descr: ceph noarch repository + target: /etc/yum.repos.d/ceph.repo + baseurl: https://packagerepo.service.consul/ceph/reef/rhel%{facts.os.release.major}/noarch/ + gpgkey: https://packagerepo.service.consul/ceph/reef/rhel%{facts.os.release.major}/x86_64/repodata/repomd.xml.key + gpgcheck: 1 + mirrorlist: absent + ceph-reef: + ensure: absent + name: ceph-reef + descr: ceph reef repository + target: /etc/yum.repos.d/ceph.repo + baseurl: https://packagerepo.service.consul/ceph/reef/rhel%{facts.os.release.major}/%{facts.os.architecture}/ + gpgkey: https://packagerepo.service.consul/ceph/reef/rhel%{facts.os.release.major}/%{facts.os.architecture}/repodata/repomd.xml.key + gpgcheck: 0 + mirrorlist: absent + + # Rancher RKE2 repositories + rancher-rke2-common-latest: + ensure: absent + name: rancher-rke2-common + descr: rancher-rke2-common repository + target: /etc/yum.repos.d/rancher-rke2-common.repo + baseurl: https://packagerepo.service.consul/rancher/rke2-common/latest/common/centos/8/noarch + gpgkey: https://packagerepo.service.consul/rancher/rke2-common/latest/common/centos/8/noarch/repodata/repomd.xml.key + gpgcheck: 1 + mirrorlist: absent + rancher-rke2-1-33-latest: + ensure: absent + name: rancher-rke2-1.33-latest + descr: rancher-rke2-1.33-latest repository + target: /etc/yum.repos.d/rancher-rke2.repo + baseurl: https://packagerepo.service.consul/rancher/rke2/v1.33.0%2Brke2r1/centos/8/%{facts.os.architecture} + gpgkey: https://packagerepo.service.consul/rancher/rke2/v1.33.0%2Brke2r1/centos/8/%{facts.os.architecture}/repodata/repomd.xml.key + gpgcheck: 1 + mirrorlist: absent + + # CentOS repositories for legacy systems + centos_8_advanced_virtualization: + ensure: absent + name: centos_8_advanced_virtualization + descr: centos_8_advanced_virtualization repository + target: /etc/yum.repos.d/centos.repo + baseurl: https://edgecache.query.consul/centos/8/virt/x86_64/advanced-virtualization + gpgkey: http://edgecache.query.consul/centos/RPM-GPG-KEY-CentOS-SIG-Virtualization + gpgcheck: 1 + mirrorlist: absent + centos_8_ceph_pacific: + ensure: absent + name: centos_8_ceph_pacific + descr: centos_8_ceph_pacific repository + target: /etc/yum.repos.d/centos.repo + baseurl: https://edgecache.query.consul/centos/8/storage/x86_64/ceph-pacific + gpgkey: http://edgecache.query.consul/centos/RPM-GPG-KEY-CentOS-SIG-Storage + gpgcheck: 1 + mirrorlist: absent + centos_8_rabbitmq_38: + ensure: absent + name: centos_8_rabbitmq_38 + descr: centos_8_rabbitmq_38 repository + target: /etc/yum.repos.d/centos.repo + baseurl: https://edgecache.query.consul/centos/8/messaging/x86_64/rabbitmq-38 + gpgkey: http://edgecache.query.consul/centos/RPM-GPG-KEY-CentOS-SIG-Messaging + gpgcheck: 1 + mirrorlist: absent + centos_8_nfv_openvswitch: + ensure: absent + name: centos_8_nfv_openvswitch + descr: centos_8_nfv_openvswitch repository + target: /etc/yum.repos.d/centos.repo + baseurl: https://edgecache.query.consul/centos/8/nfv/x86_64/openvswitch-2 + gpgkey: http://edgecache.query.consul/centos/RPM-GPG-KEY-CentOS-SIG-NFV + gpgcheck: 1 + mirrorlist: absent + centos_8_openstack_xena: + ensure: absent + name: centos_8_openstack_xena + descr: centos_8_openstack_xena repository + target: /etc/yum.repos.d/centos.repo + baseurl: https://edgecache.query.consul/centos/8/cloud/x86_64/openstack-xena + gpgkey: http://edgecache.query.consul/centos/RPM-GPG-KEY-CentOS-SIG-Cloud + gpgcheck: 1 + mirrorlist: absent + centos_8_opstools: + ensure: absent + name: centos_8_opstools + descr: centos_8_opstools repository + target: /etc/yum.repos.d/centos.repo + baseurl: https://edgecache.query.consul/centos/8/opstools/x86_64/collectd-5 + gpgkey: http://edgecache.query.consul/centos/RPM-GPG-KEY-CentOS-SIG-OpsTools + gpgcheck: 1 + mirrorlist: absent + centos_8_ovirt45: + ensure: absent + name: centos_8_ovirt45 + descr: centos_8_ovirt45 repository + target: /etc/yum.repos.d/centos.repo + baseurl: https://edgecache.query.consul/centos/8/virt/x86_64/ovirt-45 + gpgkey: http://edgecache.query.consul/centos/RPM-GPG-KEY-CentOS-SIG-Virtualization + gpgcheck: 1 + mirrorlist: absent + centos_8_stream_gluster10: + ensure: absent + name: centos_8_stream_gluster10 + descr: centos_8_stream_gluster10 repository + target: /etc/yum.repos.d/centos.repo + baseurl: https://edgecache.query.consul/centos/8-stream/storage/x86_64/gluster-10 + gpgkey: http://edgecache.query.consul/centos/RPM-GPG-KEY-CentOS-SIG-Storage + gpgcheck: 1 + mirrorlist: absent + + # Additional repositories + zfs-kmod: + ensure: absent + name: zfs-kmod + descr: zfs-kmod repository + target: /etc/yum.repos.d/zfs.repo + baseurl: https://packagerepo.service.consul/zfs/zfs/el%{facts.os.release.major}/x86_64/ + gpgkey: https://packagerepo.service.consul/zfs/zfs/el%{facts.os.release.major}/x86_64/RPM-GPG-KEY-openzfs + gpgcheck: 1 + mirrorlist: absent + rpmfusion-free: + ensure: absent + name: rpmfusion-free + descr: rpmfusion-free repository + target: /etc/yum.repos.d/rpmfusion-free.repo + baseurl: https://packagerepo.service.consul/rpmfusion-free-el%{facts.os.release.major}-%{facts.os.architecture}/ + gpgkey: https://packagerepo.service.consul/rpmfusion-free-el%{facts.os.release.major}-%{facts.os.architecture}/repodata/repomd.xml.key + gpgcheck: 1 + mirrorlist: absent + rpmfusion-nonfree: + ensure: absent + name: rpmfusion-nonfree + descr: rpmfusion-nonfree repository + target: /etc/yum.repos.d/rpmfusion-nonfree.repo + baseurl: https://packagerepo.service.consul/rpmfusion-nonfree-el%{facts.os.release.major}-%{facts.os.architecture}/ + gpgkey: https://packagerepo.service.consul/rpmfusion-nonfree-el%{facts.os.release.major}-%{facts.os.architecture}/repodata/repomd.xml.key + gpgcheck: 1 + mirrorlist: absent + unkin: + ensure: absent + name: unkin + descr: unkin repository + target: /etc/yum.repos.d/unkin.repo + baseurl: https://packagerepo.service.consul/unkin/el%{facts.os.release.major}/%{facts.os.architecture}/os + gpgkey: https://packagerepo.service.consul/unkin/el%{facts.os.release.major}/%{facts.os.architecture}/os/RPM-GPG-KEY-unkin + gpgcheck: 1 + mirrorlist: absent diff --git a/hieradata/roles/apps/media.yaml b/hieradata/roles/apps/media.yaml index 76277a7..394cb80 100644 --- a/hieradata/roles/apps/media.yaml +++ b/hieradata/roles/apps/media.yaml @@ -4,12 +4,7 @@ hiera_include: profiles::yum::global::repos: ceph-reef: - name: ceph-reef - descr: ceph reef repository - target: /etc/yum.repos.d/ceph-reef.repo - baseurl: https://edgecache.query.consul/ceph/yum/el%{facts.os.release.major}/%{facts.os.architecture} - gpgcheck: 0, - mirrorlist: absent + ensure: present profiles::ceph::client::keyrings: media: diff --git a/hieradata/roles/apps/media/jellyfin.yaml b/hieradata/roles/apps/media/jellyfin.yaml index a1e197c..661214f 100644 --- a/hieradata/roles/apps/media/jellyfin.yaml +++ b/hieradata/roles/apps/media/jellyfin.yaml @@ -54,24 +54,8 @@ profiles::consul::client::node_rules: profiles::yum::global::repos: rpmfusion-free: - name: rpmfusion-free - descr: rpmfusion-free repository - target: /etc/yum.repos.d/rpmfusion.repo - baseurl: https://download1.rpmfusion.org/free/el/updates/%{facts.os.release.major}/%{facts.os.architecture} - gpgkey: https://download1.rpmfusion.org/free/el/RPM-GPG-KEY-rpmfusion-free-el-%{facts.os.release.major} - mirrorlist: absent + ensure: present rpmfusion-nonfree: - name: rpmfusion-nonfree - descr: rpmfusion-nonfree repository - target: /etc/yum.repos.d/rpmfusion.repo - baseurl: https://download1.rpmfusion.org/nonfree/el/updates/%{facts.os.release.major}/%{facts.os.architecture} - gpgkey: https://download1.rpmfusion.org/nonfree/el/RPM-GPG-KEY-rpmfusion-nonfree-el-%{facts.os.release.major} - mirrorlist: absent + ensure: present unkinben: - name: unkinben - descr: unkinben repository - target: /etc/yum.repos.d/unkin.repo - baseurl: https://git.query.consul/api/packages/unkinben/rpm/el8 - gpgkey: https://git.query.consul/api/packages/unkinben/rpm/repository.key - gpgcheck: false - mirrorlist: absent + ensure: present diff --git a/hieradata/roles/apps/media/nzbget.yaml b/hieradata/roles/apps/media/nzbget.yaml index f13269d..2393645 100644 --- a/hieradata/roles/apps/media/nzbget.yaml +++ b/hieradata/roles/apps/media/nzbget.yaml @@ -72,16 +72,6 @@ profiles::consul::client::node_rules: profiles::yum::global::repos: rpmfusion-free: - name: rpmfusion-free - descr: rpmfusion-free repository - target: /etc/yum.repos.d/rpmfusion.repo - baseurl: https://download1.rpmfusion.org/free/el/updates/%{facts.os.release.major}/%{facts.os.architecture} - gpgkey: https://download1.rpmfusion.org/free/el/RPM-GPG-KEY-rpmfusion-free-el-%{facts.os.release.major} - mirrorlist: absent + ensure: present rpmfusion-nonfree: - name: rpmfusion-nonfree - descr: rpmfusion-nonfree repository - target: /etc/yum.repos.d/rpmfusion.repo - baseurl: https://download1.rpmfusion.org/nonfree/el/updates/%{facts.os.release.major}/%{facts.os.architecture} - gpgkey: https://download1.rpmfusion.org/nonfree/el/RPM-GPG-KEY-rpmfusion-nonfree-el-%{facts.os.release.major} - mirrorlist: absent + ensure: present diff --git a/hieradata/roles/ceph.yaml b/hieradata/roles/ceph.yaml index cf89fc5..61508a6 100644 --- a/hieradata/roles/ceph.yaml +++ b/hieradata/roles/ceph.yaml @@ -31,30 +31,10 @@ frrouting::daemons: # additional repos profiles::yum::global::repos: ceph: - name: ceph - descr: ceph repository - target: /etc/yum.repos.d/ceph.repo - baseurl: https://edgecache.query.consul/ceph/yum/el%{facts.os.release.major}/%{facts.os.architecture} - gpgkey: https://download.ceph.com/keys/release.asc - mirrorlist: absent + ensure: present ceph-noarch: - name: ceph-noarch - descr: ceph-noarch repository - target: /etc/yum.repos.d/ceph-noarch.repo - baseurl: https://edgecache.query.consul/ceph/yum/el%{facts.os.release.major}/noarch - gpgkey: https://download.ceph.com/keys/release.asc - mirrorlist: absent + ensure: present frr-extras: - name: frr-extras - descr: frr-extras repository - target: /etc/yum.repos.d/frr-extras.repo - baseurl: https://packagerepo.service.consul/frr/el9/extras-daily/%{facts.os.architecture}/os - gpgkey: https://packagerepo.service.consul/frr/el9/extras-daily/%{facts.os.architecture}/os/RPM-GPG-KEY-FRR - mirrorlist: absent + ensure: present frr-stable: - name: frr-stable - descr: frr-stable repository - target: /etc/yum.repos.d/frr-stable.repo - baseurl: https://packagerepo.service.consul/frr/el9/stable-daily/%{facts.os.architecture}/os - gpgkey: https://packagerepo.service.consul/frr/el9/stable-daily/%{facts.os.architecture}/os/RPM-GPG-KEY-FRR - mirrorlist: absent + ensure: present diff --git a/hieradata/roles/infra/ceph/rgw.yaml b/hieradata/roles/infra/ceph/rgw.yaml index e4a964e..7b65271 100644 --- a/hieradata/roles/infra/ceph/rgw.yaml +++ b/hieradata/roles/infra/ceph/rgw.yaml @@ -18,19 +18,9 @@ profiles::pki::vault::alt_names: # additional repos profiles::yum::global::repos: ceph: - name: ceph - descr: ceph repository - target: /etc/yum.repos.d/ceph.repo - baseurl: https://edgecache.query.consul/ceph/yum/el%{facts.os.release.major}/%{facts.os.architecture} - gpgkey: https://download.ceph.com/keys/release.asc - mirrorlist: absent + ensure: present ceph-noarch: - name: ceph-noarch - descr: ceph-noarch repository - target: /etc/yum.repos.d/ceph-noarch.repo - baseurl: https://edgecache.query.consul/ceph/yum/el%{facts.os.release.major}/noarch - gpgkey: https://download.ceph.com/keys/release.asc - mirrorlist: absent + ensure: present # manage a simple nginx reverse proxy profiles::nginx::simpleproxy::nginx_vhost: 'radosgw.service.consul' diff --git a/hieradata/roles/infra/cobbler/server.yaml b/hieradata/roles/infra/cobbler/server.yaml index d689b73..02112cb 100644 --- a/hieradata/roles/infra/cobbler/server.yaml +++ b/hieradata/roles/infra/cobbler/server.yaml @@ -57,19 +57,9 @@ profiles::consul::client::node_rules: # additional repos profiles::yum::global::repos: frr-extras: - name: frr-extras - descr: frr-extras repository - target: /etc/yum.repos.d/frr-extras.repo - baseurl: https://packagerepo.service.consul/frr/el%{facts.os.release.major}/extras-daily/%{facts.os.architecture}/os - gpgkey: https://packagerepo.service.consul/frr/el%{facts.os.release.major}/extras-daily/%{facts.os.architecture}/os/RPM-GPG-KEY-FRR - mirrorlist: absent + ensure: present frr-stable: - name: frr-stable - descr: frr-stable repository - target: /etc/yum.repos.d/frr-stable.repo - baseurl: https://packagerepo.service.consul/frr/el%{facts.os.release.major}/stable-daily/%{facts.os.architecture}/os - gpgkey: https://packagerepo.service.consul/frr/el%{facts.os.release.major}/stable-daily/%{facts.os.architecture}/os/RPM-GPG-KEY-FRR - mirrorlist: absent + ensure: present # cobbler settings profiles::cobbler::params::service_cname: 'cobbler.main.unkin.net' diff --git a/hieradata/roles/infra/dhcp/server.yaml b/hieradata/roles/infra/dhcp/server.yaml index cdf4256..e23a369 100644 --- a/hieradata/roles/infra/dhcp/server.yaml +++ b/hieradata/roles/infra/dhcp/server.yaml @@ -41,19 +41,9 @@ profiles::consul::client::node_rules: # additional repos profiles::yum::global::repos: frr-extras: - name: frr-extras - descr: frr-extras repository - target: /etc/yum.repos.d/frr-extras.repo - baseurl: https://packagerepo.service.consul/frr/el9/extras-daily/%{facts.os.architecture}/os - gpgkey: https://packagerepo.service.consul/frr/el9/extras-daily/%{facts.os.architecture}/os/RPM-GPG-KEY-FRR - mirrorlist: absent + ensure: present frr-stable: - name: frr-stable - descr: frr-stable repository - target: /etc/yum.repos.d/frr-stable.repo - baseurl: https://packagerepo.service.consul/frr/el9/stable-daily/%{facts.os.architecture}/os - gpgkey: https://packagerepo.service.consul/frr/el9/stable-daily/%{facts.os.architecture}/os/RPM-GPG-KEY-FRR - mirrorlist: absent + ensure: present profiles::dhcp::server::ntpservers: - 0.au.pool.ntp.org diff --git a/hieradata/roles/infra/dns/externaldns.yaml b/hieradata/roles/infra/dns/externaldns.yaml index 6a7aa19..69511f5 100644 --- a/hieradata/roles/infra/dns/externaldns.yaml +++ b/hieradata/roles/infra/dns/externaldns.yaml @@ -50,16 +50,6 @@ profiles::consul::client::node_rules: # additional repos profiles::yum::global::repos: frr-extras: - name: frr-extras - descr: frr-extras repository - target: /etc/yum.repos.d/frr-extras.repo - baseurl: https://packagerepo.service.consul/frr/el9/extras-daily/%{facts.os.architecture}/os - gpgkey: https://packagerepo.service.consul/frr/el9/extras-daily/%{facts.os.architecture}/os/RPM-GPG-KEY-FRR - mirrorlist: absent + ensure: present frr-stable: - name: frr-stable - descr: frr-stable repository - target: /etc/yum.repos.d/frr-stable.repo - baseurl: https://packagerepo.service.consul/frr/el9/stable-daily/%{facts.os.architecture}/os - gpgkey: https://packagerepo.service.consul/frr/el9/stable-daily/%{facts.os.architecture}/os/RPM-GPG-KEY-FRR - mirrorlist: absent + ensure: present diff --git a/hieradata/roles/infra/dns/master.yaml b/hieradata/roles/infra/dns/master.yaml index bcce5b0..a550c03 100644 --- a/hieradata/roles/infra/dns/master.yaml +++ b/hieradata/roles/infra/dns/master.yaml @@ -200,16 +200,6 @@ profiles::consul::client::node_rules: # additional repos profiles::yum::global::repos: frr-extras: - name: frr-extras - descr: frr-extras repository - target: /etc/yum.repos.d/frr-extras.repo - baseurl: https://packagerepo.service.consul/frr/el9/extras-daily/%{facts.os.architecture}/os - gpgkey: https://packagerepo.service.consul/frr/el9/extras-daily/%{facts.os.architecture}/os/RPM-GPG-KEY-FRR - mirrorlist: absent + ensure: present frr-stable: - name: frr-stable - descr: frr-stable repository - target: /etc/yum.repos.d/frr-stable.repo - baseurl: https://packagerepo.service.consul/frr/el9/stable-daily/%{facts.os.architecture}/os - gpgkey: https://packagerepo.service.consul/frr/el9/stable-daily/%{facts.os.architecture}/os/RPM-GPG-KEY-FRR - mirrorlist: absent + ensure: present diff --git a/hieradata/roles/infra/dns/resolver.yaml b/hieradata/roles/infra/dns/resolver.yaml index 4549599..81e5ea3 100644 --- a/hieradata/roles/infra/dns/resolver.yaml +++ b/hieradata/roles/infra/dns/resolver.yaml @@ -261,16 +261,6 @@ profiles::consul::client::node_rules: # additional repos profiles::yum::global::repos: frr-extras: - name: frr-extras - descr: frr-extras repository - target: /etc/yum.repos.d/frr-extras.repo - baseurl: https://packagerepo.service.consul/frr/el9/extras-daily/%{facts.os.architecture}/os - gpgkey: https://packagerepo.service.consul/frr/el9/extras-daily/%{facts.os.architecture}/os/RPM-GPG-KEY-FRR - mirrorlist: absent + ensure: present frr-stable: - name: frr-stable - descr: frr-stable repository - target: /etc/yum.repos.d/frr-stable.repo - baseurl: https://packagerepo.service.consul/frr/el9/stable-daily/%{facts.os.architecture}/os - gpgkey: https://packagerepo.service.consul/frr/el9/stable-daily/%{facts.os.architecture}/os/RPM-GPG-KEY-FRR - mirrorlist: absent + ensure: present diff --git a/hieradata/roles/infra/halb/haproxy2.yaml b/hieradata/roles/infra/halb/haproxy2.yaml index 10d19c6..1fe0323 100644 --- a/hieradata/roles/infra/halb/haproxy2.yaml +++ b/hieradata/roles/infra/halb/haproxy2.yaml @@ -35,19 +35,9 @@ frrouting::daemons: # additional repos profiles::yum::global::repos: frr-extras: - name: frr-extras - descr: frr-extras repository - target: /etc/yum.repos.d/frr-extras.repo - baseurl: https://packagerepo.service.consul/frr/el9/extras-daily/%{facts.os.architecture}/os - gpgkey: https://packagerepo.service.consul/frr/el9/extras-daily/%{facts.os.architecture}/os/RPM-GPG-KEY-FRR - mirrorlist: absent + ensure: present frr-stable: - name: frr-stable - descr: frr-stable repository - target: /etc/yum.repos.d/frr-stable.repo - baseurl: https://packagerepo.service.consul/frr/el9/stable-daily/%{facts.os.architecture}/os - gpgkey: https://packagerepo.service.consul/frr/el9/stable-daily/%{facts.os.architecture}/os/RPM-GPG-KEY-FRR - mirrorlist: absent + ensure: present # haproxy metrics consul::services: diff --git a/hieradata/roles/infra/incus/node.yaml b/hieradata/roles/infra/incus/node.yaml index fc835cd..c2a5aa1 100644 --- a/hieradata/roles/infra/incus/node.yaml +++ b/hieradata/roles/infra/incus/node.yaml @@ -85,40 +85,15 @@ profiles::consul::client::node_rules: # additional repos profiles::yum::global::repos: ceph: - name: ceph - descr: ceph repository - target: /etc/yum.repos.d/ceph.repo - baseurl: https://edgecache.query.consul/ceph/yum/el%{facts.os.release.major}/%{facts.os.architecture} - gpgkey: https://download.ceph.com/keys/release.asc - mirrorlist: absent + ensure: present ceph-noarch: - name: ceph-noarch - descr: ceph-noarch repository - target: /etc/yum.repos.d/ceph-noarch.repo - baseurl: https://edgecache.query.consul/ceph/yum/el%{facts.os.release.major}/noarch - gpgkey: https://download.ceph.com/keys/release.asc - mirrorlist: absent + ensure: present frr-extras: - name: frr-extras - descr: frr-extras repository - target: /etc/yum.repos.d/frr-extras.repo - baseurl: https://packagerepo.service.consul/frr/el9/extras-daily/%{facts.os.architecture}/os - gpgkey: https://packagerepo.service.consul/frr/el9/extras-daily/%{facts.os.architecture}/os/RPM-GPG-KEY-FRR - mirrorlist: absent + ensure: present frr-stable: - name: frr-stable - descr: frr-stable repository - target: /etc/yum.repos.d/frr-stable.repo - baseurl: https://packagerepo.service.consul/frr/el9/stable-daily/%{facts.os.architecture}/os - gpgkey: https://packagerepo.service.consul/frr/el9/stable-daily/%{facts.os.architecture}/os/RPM-GPG-KEY-FRR - mirrorlist: absent + ensure: present zfs-kmod: - name: zfs-kmod - descr: zfs-kmod repository - target: /etc/yum.repos.d/zfs-kmod.repo - baseurl: https://packagerepo.service.consul/zfs/rhel9/kmod-daily/%{facts.os.architecture}/os - gpgkey: https://packagerepo.service.consul/zfs/rhel9/kmod-daily/%{facts.os.architecture}/os/RPM-GPG-KEY-openzfs-2022 - mirrorlist: absent + ensure: present # dns profiles::dns::base::primary_interface: loopback0 diff --git a/hieradata/roles/infra/k8s.yaml b/hieradata/roles/infra/k8s.yaml index a5068e9..3b55032 100644 --- a/hieradata/roles/infra/k8s.yaml +++ b/hieradata/roles/infra/k8s.yaml @@ -47,47 +47,17 @@ profiles::ceph::client::mons: # additional repos profiles::yum::global::repos: ceph: - name: ceph - descr: ceph repository - target: /etc/yum.repos.d/ceph.repo - baseurl: https://edgecache.query.consul/ceph/yum/el%{facts.os.release.major}/%{facts.os.architecture} - gpgkey: https://download.ceph.com/keys/release.asc - mirrorlist: absent + ensure: present ceph-noarch: - name: ceph-noarch - descr: ceph-noarch repository - target: /etc/yum.repos.d/ceph-noarch.repo - baseurl: https://edgecache.query.consul/ceph/yum/el%{facts.os.release.major}/noarch - gpgkey: https://download.ceph.com/keys/release.asc - mirrorlist: absent + ensure: present frr-extras: - name: frr-extras - descr: frr-extras repository - target: /etc/yum.repos.d/frr-extras.repo - baseurl: https://packagerepo.service.consul/frr/el9/extras-daily/%{facts.os.architecture}/os - gpgkey: https://packagerepo.service.consul/frr/el9/extras-daily/%{facts.os.architecture}/os/RPM-GPG-KEY-FRR - mirrorlist: absent + ensure: present frr-stable: - name: frr-stable - descr: frr-stable repository - target: /etc/yum.repos.d/frr-stable.repo - baseurl: https://packagerepo.service.consul/frr/el9/stable-daily/%{facts.os.architecture}/os - gpgkey: https://packagerepo.service.consul/frr/el9/stable-daily/%{facts.os.architecture}/os/RPM-GPG-KEY-FRR - mirrorlist: absent + ensure: present rancher-rke2-common-latest: - name: rancher-rke2-common-latest - descr: rancher-rke2-common-latest - target: /etc/yum.repos.d/rke2-common.repo - baseurl: https://packagerepo.service.consul/rke2/rhel%{facts.os.release.major}/common-daily/x86_64/os/ - gpgkey: https://packagerepo.service.consul/rke2/rhel%{facts.os.release.major}/common-daily/x86_64/os/public.key - mirrorlist: absent + ensure: present rancher-rke2-1-33-latest: - name: rancher-rke2-1-33-latest - descr: rancher-rke2-1-33-latest - target: /etc/yum.repos.d/rke2-1-33.repo - baseurl: https://packagerepo.service.consul/rke2/rhel%{facts.os.release.major}/1.33-daily/x86_64/os/ - gpgkey: https://packagerepo.service.consul/rke2/rhel%{facts.os.release.major}/1.33-daily/x86_64/os/public.key - mirrorlist: absent + ensure: present # dns profiles::dns::base::primary_interface: loopback0 diff --git a/hieradata/roles/infra/k8s/node.yaml b/hieradata/roles/infra/k8s/node.yaml index 53d077f..6dfb9ae 100644 --- a/hieradata/roles/infra/k8s/node.yaml +++ b/hieradata/roles/infra/k8s/node.yaml @@ -47,47 +47,17 @@ profiles::ceph::client::mons: # additional repos profiles::yum::global::repos: ceph: - name: ceph - descr: ceph repository - target: /etc/yum.repos.d/ceph.repo - baseurl: https://edgecache.query.consul/ceph/yum/el%{facts.os.release.major}/%{facts.os.architecture} - gpgkey: https://download.ceph.com/keys/release.asc - mirrorlist: absent + ensure: present ceph-noarch: - name: ceph-noarch - descr: ceph-noarch repository - target: /etc/yum.repos.d/ceph-noarch.repo - baseurl: https://edgecache.query.consul/ceph/yum/el%{facts.os.release.major}/noarch - gpgkey: https://download.ceph.com/keys/release.asc - mirrorlist: absent + ensure: present frr-extras: - name: frr-extras - descr: frr-extras repository - target: /etc/yum.repos.d/frr-extras.repo - baseurl: https://packagerepo.service.consul/frr/el9/extras-daily/%{facts.os.architecture}/os - gpgkey: https://packagerepo.service.consul/frr/el9/extras-daily/%{facts.os.architecture}/os/RPM-GPG-KEY-FRR - mirrorlist: absent + ensure: present frr-stable: - name: frr-stable - descr: frr-stable repository - target: /etc/yum.repos.d/frr-stable.repo - baseurl: https://packagerepo.service.consul/frr/el9/stable-daily/%{facts.os.architecture}/os - gpgkey: https://packagerepo.service.consul/frr/el9/stable-daily/%{facts.os.architecture}/os/RPM-GPG-KEY-FRR - mirrorlist: absent + ensure: present rancher-rke2-common-latest: - name: rancher-rke2-common-latest - descr: rancher-rke2-common-latest - target: /etc/yum.repos.d/rke2-common.repo - baseurl: https://rpm.rancher.io/rke2/latest/common/centos/%{facts.os.release.major}/noarch - gpgkey: https://rpm.rancher.io/public.key - mirrorlist: absent + ensure: present rancher-rke2-1-33-latest: - name: rancher-rke2-1-33-latest - descr: rancher-rke2-1-33-latest - target: /etc/yum.repos.d/rke2-1-33.repo - baseurl: https://rpm.rancher.io/rke2/latest/1.33/centos/%{facts.os.release.major}/x86_64 - gpgkey: https://rpm.rancher.io/public.key - mirrorlist: absent + ensure: present # dns profiles::dns::base::primary_interface: loopback0 diff --git a/hieradata/roles/infra/nomad/agent.yaml b/hieradata/roles/infra/nomad/agent.yaml index bbce070..73b3e98 100644 --- a/hieradata/roles/infra/nomad/agent.yaml +++ b/hieradata/roles/infra/nomad/agent.yaml @@ -25,12 +25,7 @@ frrouting::ospfd_interfaces: profiles::yum::global::repos: ceph-reef: - name: ceph-reef - descr: ceph reef repository - target: /etc/yum.repos.d/ceph-reef.repo - baseurl: https://edgecache.query.consul/ceph/yum/el%{facts.os.release.major}/%{facts.os.architecture} - gpgcheck: 0, - mirrorlist: absent + ensure: present profiles::ceph::client::keyrings: nomad: diff --git a/hieradata/roles/infra/ovirt/engine.yaml b/hieradata/roles/infra/ovirt/engine.yaml index b2a934d..2795bb8 100644 --- a/hieradata/roles/infra/ovirt/engine.yaml +++ b/hieradata/roles/infra/ovirt/engine.yaml @@ -1,50 +1,18 @@ --- profiles::yum::global::repos: centos_8_advanced_virtualization: - name: 'virt-advanced-virtualization' - descr: 'CentOS Advanced Virtualization' - target: /etc/yum.repos.d/ovirt.repo - baseurl: https://edgecache.query.consul/centos/8-stream/virt/x86_64/advancedvirt-common - gpgkey: 'https://www.centos.org/keys/RPM-GPG-KEY-CentOS-SIG-Virtualization' + ensure: present centos_8_ceph_pacific: - name: 'storage-ceph-pacific' - descr: 'CentOS Ceph Pacific' - target: /etc/yum.repos.d/ovirt.repo - baseurl: https://edgecache.query.consul/centos/8-stream/storage/x86_64/ceph-pacific - gpgkey: 'https://www.centos.org/keys/RPM-GPG-KEY-CentOS-SIG-Storage' + ensure: present centos_8_rabbitmq_38: - name: 'messaging-rabbitmq-38' - descr: 'CentOS RabbitMQ 38' - target: /etc/yum.repos.d/ovirt.repo - baseurl: https://edgecache.query.consul/centos/8-stream/messaging/x86_64/rabbitmq-38 - gpgkey: 'https://www.centos.org/keys/RPM-GPG-KEY-CentOS-SIG-Messaging' + ensure: present centos_8_nfv_openvswitch: - name: 'nfv-openvswitch-2' - descr: 'CentOS NFV OpenvSwitch' - target: /etc/yum.repos.d/ovirt.repo - baseurl: https://edgecache.query.consul/centos/8-stream/nfv/x86_64/openvswitch-2 - gpgkey: 'https://www.centos.org/keys/RPM-GPG-KEY-CentOS-SIG-NFV' + ensure: present centos_8_openstack_xena: - name: 'cloud-openstack-xena' - descr: 'CentOS OpenStack Xena' - target: /etc/yum.repos.d/ovirt.repo - baseurl: https://edgecache.query.consul/centos/8-stream/cloud/x86_64/openstack-xena - gpgkey: 'https://www.centos.org/keys/RPM-GPG-KEY-CentOS-SIG-Cloud' + ensure: present centos_8_opstools: - name: 'opstools-collectd-5' - descr: 'CentOS OpsTools - collectd' - target: /etc/yum.repos.d/ovirt.repo - baseurl: https://edgecache.query.consul/centos/8-stream/opstools/x86_64/collectd-5 - gpgkey: 'https://www.centos.org/keys/RPM-GPG-KEY-CentOS-SIG-OpsTools' + ensure: present centos_8_ovirt45: - name: 'virt-ovirt-45' - descr: 'CentOS oVirt 4.5' - target: /etc/yum.repos.d/ovirt.repo - baseurl: https://edgecache.query.consul/centos/8-stream/virt/x86_64/ovirt-45 - gpgkey: 'https://www.centos.org/keys/RPM-GPG-KEY-CentOS-SIG-Virtualization' + ensure: present centos_8_stream_gluster10: - name: 'storage-gluster-10' - descr: 'CentOS oVirt 4.5 - Glusterfs 10' - target: /etc/yum.repos.d/ovirt.repo - baseurl: https://edgecache.query.consul/centos/8-stream/storage/x86_64/gluster-10 - gpgkey: 'https://www.centos.org/keys/RPM-GPG-KEY-CentOS-SIG-Storage' + ensure: present diff --git a/hieradata/roles/infra/ovirt/node.yaml b/hieradata/roles/infra/ovirt/node.yaml index 762c1aa..ba39976 100644 --- a/hieradata/roles/infra/ovirt/node.yaml +++ b/hieradata/roles/infra/ovirt/node.yaml @@ -9,50 +9,18 @@ sudo::purge_ignore: profiles::yum::global::repos: centos_8_advanced_virtualization: - name: 'virt-advanced-virtualization' - descr: 'CentOS Advanced Virtualization' - target: /etc/yum.repos.d/ovirt.repo - baseurl: https://edgecache.query.consul/centos/8-stream/virt/x86_64/advancedvirt-common - gpgkey: 'https://www.centos.org/keys/RPM-GPG-KEY-CentOS-SIG-Virtualization' + ensure: present centos_8_ceph_pacific: - name: 'storage-ceph-pacific' - descr: 'CentOS Ceph Pacific' - target: /etc/yum.repos.d/ovirt.repo - baseurl: https://edgecache.query.consul/centos/8-stream/storage/x86_64/ceph-pacific - gpgkey: 'https://www.centos.org/keys/RPM-GPG-KEY-CentOS-SIG-Storage' + ensure: present centos_8_rabbitmq_38: - name: 'messaging-rabbitmq-38' - descr: 'CentOS RabbitMQ 38' - target: /etc/yum.repos.d/ovirt.repo - baseurl: https://edgecache.query.consul/centos/8-stream/messaging/x86_64/rabbitmq-38 - gpgkey: 'https://www.centos.org/keys/RPM-GPG-KEY-CentOS-SIG-Messaging' + ensure: present centos_8_nfv_openvswitch: - name: 'nfv-openvswitch-2' - descr: 'CentOS NFV OpenvSwitch' - target: /etc/yum.repos.d/ovirt.repo - baseurl: https://edgecache.query.consul/centos/8-stream/nfv/x86_64/openvswitch-2 - gpgkey: 'https://www.centos.org/keys/RPM-GPG-KEY-CentOS-SIG-NFV' + ensure: present centos_8_openstack_xena: - name: 'cloud-openstack-xena' - descr: 'CentOS OpenStack Xena' - target: /etc/yum.repos.d/ovirt.repo - baseurl: https://edgecache.query.consul/centos/8-stream/cloud/x86_64/openstack-xena - gpgkey: 'https://www.centos.org/keys/RPM-GPG-KEY-CentOS-SIG-Cloud' + ensure: present centos_8_opstools: - name: 'opstools-collectd-5' - descr: 'CentOS OpsTools - collectd' - target: /etc/yum.repos.d/ovirt.repo - baseurl: https://edgecache.query.consul/centos/8-stream/opstools/x86_64/collectd-5 - gpgkey: 'https://www.centos.org/keys/RPM-GPG-KEY-CentOS-SIG-OpsTools' + ensure: present centos_8_ovirt45: - name: 'virt-ovirt-45' - descr: 'CentOS oVirt 4.5' - target: /etc/yum.repos.d/ovirt.repo - baseurl: https://edgecache.query.consul/centos/8-stream/virt/x86_64/ovirt-45 - gpgkey: 'https://www.centos.org/keys/RPM-GPG-KEY-CentOS-SIG-Virtualization' + ensure: present centos_8_stream_gluster10: - name: 'storage-gluster-10' - descr: 'CentOS oVirt 4.5 - Glusterfs 10' - target: /etc/yum.repos.d/ovirt.repo - baseurl: https://edgecache.query.consul/centos/8-stream/storage/x86_64/gluster-10 - gpgkey: 'https://www.centos.org/keys/RPM-GPG-KEY-CentOS-SIG-Storage' + ensure: present diff --git a/hieradata/roles/infra/puppetdb/sql.yaml b/hieradata/roles/infra/puppetdb/sql.yaml index 1c9719d..bae900c 100644 --- a/hieradata/roles/infra/puppetdb/sql.yaml +++ b/hieradata/roles/infra/puppetdb/sql.yaml @@ -62,14 +62,6 @@ profiles::consul::client::node_rules: profiles::yum::global::repos: postgresql-17: - name: postgresql-17 - descr: postgresql-17 repository - target: /etc/yum.repos.d/postgresql.repo - baseurl: https://packagerepo.service.consul/postgresql/rhel%{facts.os.release.major}/17-daily/%{facts.os.architecture}/os - gpgkey: https://packagerepo.service.consul/postgresql/rhel%{facts.os.release.major}/17-daily/%{facts.os.architecture}/os/PGDG-RPM-GPG-KEY-RHEL + ensure: present postgresql-common: - name: postgresql-common - descr: postgresql-common repository - target: /etc/yum.repos.d/postgresql.repo - baseurl: https://packagerepo.service.consul/postgresql/rhel%{facts.os.release.major}/common-daily/%{facts.os.architecture}/os - gpgkey: https://packagerepo.service.consul/postgresql/rhel%{facts.os.release.major}/common-daily/%{facts.os.architecture}/os/PGDG-RPM-GPG-KEY-RHEL + ensure: present diff --git a/hieradata/roles/infra/sql/patroni.yaml b/hieradata/roles/infra/sql/patroni.yaml index 6f83721..2c29ca6 100644 --- a/hieradata/roles/infra/sql/patroni.yaml +++ b/hieradata/roles/infra/sql/patroni.yaml @@ -1,17 +1,9 @@ --- profiles::yum::global::repos: postgresql-15: - name: postgresql-15 - descr: postgresql-15 repository - target: /etc/yum.repos.d/postgresql.repo - baseurl: https://packagerepo.service.consul/postgresql/rhel%{facts.os.release.major}/15-daily/%{facts.os.architecture}/os - gpgkey: https://packagerepo.service.consul/postgresql/rhel%{facts.os.release.major}/15-daily/%{facts.os.architecture}/os/PGDG-RPM-GPG-KEY-RHEL + ensure: present postgresql-common: - name: postgresql-common - descr: postgresql-common repository - target: /etc/yum.repos.d/postgresql.repo - baseurl: https://packagerepo.service.consul/postgresql/rhel%{facts.os.release.major}/common-daily/%{facts.os.architecture}/os - gpgkey: https://packagerepo.service.consul/postgresql/rhel%{facts.os.release.major}/common-daily/%{facts.os.architecture}/os/PGDG-RPM-GPG-KEY-RHEL + ensure: present profiles::sql::patroni::cluster_name: "patroni-%{facts.environment}" profiles::sql::patroni::postgres_exporter_enabled: true diff --git a/hieradata/roles/infra/sql/shared.yaml b/hieradata/roles/infra/sql/shared.yaml index 88cf1d5..be80875 100644 --- a/hieradata/roles/infra/sql/shared.yaml +++ b/hieradata/roles/infra/sql/shared.yaml @@ -47,14 +47,6 @@ profiles::consul::client::node_rules: profiles::yum::global::repos: postgresql-17: - name: postgresql-17 - descr: postgresql-17 repository - target: /etc/yum.repos.d/postgresql.repo - baseurl: https://packagerepo.service.consul/postgresql/rhel%{facts.os.release.major}/17-daily/%{facts.os.architecture}/os - gpgkey: https://packagerepo.service.consul/postgresql/rhel%{facts.os.release.major}/17-daily/%{facts.os.architecture}/os/PGDG-RPM-GPG-KEY-RHEL + ensure: present postgresql-common: - name: postgresql-common - descr: postgresql-common repository - target: /etc/yum.repos.d/postgresql.repo - baseurl: https://packagerepo.service.consul/postgresql/rhel%{facts.os.release.major}/common-daily/%{facts.os.architecture}/os - gpgkey: https://packagerepo.service.consul/postgresql/rhel%{facts.os.release.major}/common-daily/%{facts.os.architecture}/os/PGDG-RPM-GPG-KEY-RHEL + ensure: present diff --git a/hieradata/roles/infra/storage/consul.yaml b/hieradata/roles/infra/storage/consul.yaml index 5a5c169..6c1bdf8 100644 --- a/hieradata/roles/infra/storage/consul.yaml +++ b/hieradata/roles/infra/storage/consul.yaml @@ -134,19 +134,9 @@ frrouting::ospfd_interfaces: frrouting::daemons: ospfd: true -# additional repos +# additional repos - enable needed repositories profiles::yum::global::repos: frr-extras: - name: frr-extras - descr: frr-extras repository - target: /etc/yum.repos.d/frr-extras.repo - baseurl: https://packagerepo.service.consul/frr/el9/extras-daily/%{facts.os.architecture}/os - gpgkey: https://packagerepo.service.consul/frr/el9/extras-daily/%{facts.os.architecture}/os/RPM-GPG-KEY-FRR - mirrorlist: absent + ensure: present frr-stable: - name: frr-stable - descr: frr-stable repository - target: /etc/yum.repos.d/frr-stable.repo - baseurl: https://packagerepo.service.consul/frr/el9/stable-daily/%{facts.os.architecture}/os - gpgkey: https://packagerepo.service.consul/frr/el9/stable-daily/%{facts.os.architecture}/os/RPM-GPG-KEY-FRR - mirrorlist: absent + ensure: present