From 86cda92952079d2cf130ea6f1f083cd910c847ea Mon Sep 17 00:00:00 2001
From: Magnus Svensson <magnus@ctrl-c.liu.se>
Date: Thu, 27 Mar 2025 15:46:54 +0100
Subject: [PATCH] This moved to liurepo::pulp_types::*
---
manifests/deb_repo.pp | 64 ------------------------
manifests/deb_repos.pp | 9 ----
manifests/rpm_repo.pp | 94 -----------------------------------
manifests/rpm_repos.pp | 9 ----
spec/defines/deb_repo_spec.rb | 29 -----------
spec/defines/rpm_repo_spec.rb | 27 ----------
6 files changed, 232 deletions(-)
delete mode 100644 manifests/deb_repo.pp
delete mode 100644 manifests/deb_repos.pp
delete mode 100644 manifests/rpm_repo.pp
delete mode 100644 manifests/rpm_repos.pp
delete mode 100644 spec/defines/deb_repo_spec.rb
delete mode 100644 spec/defines/rpm_repo_spec.rb
diff --git a/manifests/deb_repo.pp b/manifests/deb_repo.pp
deleted file mode 100644
index 0f167ab..0000000
--- a/manifests/deb_repo.pp
+++ /dev/null
@@ -1,64 +0,0 @@
-# @summary
-# Manage pulp repositories.
-#
-# @param url
-# Remote url.
-#
-# @param ensure
-# Whether resource should be present or absent.
-#
-define liu_pulpcore::deb_repo (
- Optional[Stdlib::HTTPUrl] $url = undef,
- Optional[String] $description = undef,
- Optional[String] $distributions = undef,
- Optional[String] $components = undef,
- Optional[String] $architectures = undef,
- Optional[Integer] $retain_repo_versions = undef,
- Optional[Boolean] $sync_sources = undef,
- Optional[Boolean] $sync_udebs = undef,
- Optional[Boolean] $sync_installer = undef,
- Optional[Boolean] $simple = undef,
- Optional[Boolean] $structured = undef,
- Enum[absent, present] $ensure = present,
-) {
- $path = '/usr/bin'
- if $url {
- liu_pulpcore_deb_remote { $title:
- ensure => $ensure,
- url => $url,
- distributions => $distributions,
- components => $components,
- architectures => $architectures,
- sync_sources => $sync_sources,
- sync_udebs => $sync_udebs,
- sync_installer => $sync_installer,
- }
- liu_pulpcore_deb_repository { $title:
- ensure => $ensure,
- description => $description,
- remote => $title,
- retain_repo_versions => 1,
- }
- cron { "repo_sync_${title}":
- ensure => $ensure,
- command => "${path}/pulp deb repository sync --name ${title} >/dev/null 2>&1",
- minute => fqdn_rand(59, $title),
- }
- } else {
- liu_pulpcore_deb_repository { $title:
- ensure => $ensure,
- description => $description,
- retain_repo_versions => $retain_repo_versions,
- }
- }
- liu_pulpcore_deb_publication { $title:
- ensure => $ensure,
- simple => $simple,
- structured => $structured,
- }
- liu_pulpcore_deb_distribution { $title:
- ensure => $ensure,
- repository => $title,
- base_path => $title,
- }
-}
diff --git a/manifests/deb_repos.pp b/manifests/deb_repos.pp
deleted file mode 100644
index f7fbb39..0000000
--- a/manifests/deb_repos.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-class liu_pulpcore::deb_repos (
- Hash $repos,
-) {
- $repos.each |$key, $data| {
- liu_pulpcore::deb_repo { $key:
- * => $data,
- }
- }
-}
diff --git a/manifests/rpm_repo.pp b/manifests/rpm_repo.pp
deleted file mode 100644
index 39365be..0000000
--- a/manifests/rpm_repo.pp
+++ /dev/null
@@ -1,94 +0,0 @@
-# @summary
-# Manage pulp repositories.
-#
-# @param url
-# Remote url.
-#
-# @param ensure
-# Whether resource should be present or absent.
-#
-define liu_pulpcore::rpm_repo (
- Optional[Stdlib::HTTPUrl] $url = undef,
- Optional[String] $description = undef,
- Optional[Enum[
- 'md5',
- 'sha1',
- 'sha224',
- 'sha256',
- 'sha384',
- 'sha512',
- ]
- ] $package_checksum_type = undef,
- Optional[Enum[
- 'md5',
- 'sha1',
- 'sha224',
- 'sha256',
- 'sha384',
- 'sha512',
- ]
- ] $metadata_checksum_type = undef,
- Optional[Enum[
- 'zstd',
- 'gz',
- ]
- ] $compression_type = undef,
- Optional[Integer] $retain_package_versions = undef,
- Optional[Integer] $retain_repo_versions = undef,
- Optional[String] $ca_cert = undef,
- Optional[String] $client_cert = undef,
- Optional[String] $client_key = undef,
- Optional[String] $username = undef,
- Optional[String] $password = undef,
- Optional[Boolean] $autopublish = undef,
- Enum[absent, present] $ensure = present,
-) {
- $path = '/usr/bin'
- if $url {
- liu_pulpcore_rpm_remote { $title:
- ensure => $ensure,
- url => $url,
- ca_cert => $ca_cert,
- client_cert => $client_cert,
- client_key => $client_key,
- username => $username,
- password => $password,
- }
- liu_pulpcore_rpm_repository { $title:
- ensure => $ensure,
- description => $description,
- autopublish => true,
- remote => $title,
- package_checksum_type => $package_checksum_type,
- metadata_checksum_type => $metadata_checksum_type,
- retain_package_versions => $retain_package_versions,
- retain_repo_versions => 1,
- }
- cron { "repo_sync_${title}":
- ensure => $ensure,
- command => "${path}/pulp rpm repository sync --name ${title} >/dev/null 2>&1",
- minute => fqdn_rand(59, $title),
- }
- } else {
- liu_pulpcore_rpm_repository { $title:
- ensure => $ensure,
- description => $description,
- autopublish => $autopublish,
- package_checksum_type => $package_checksum_type,
- metadata_checksum_type => $metadata_checksum_type,
- retain_package_versions => $retain_package_versions,
- retain_repo_versions => 1,
- }
- }
- liu_pulpcore_rpm_publication { $title:
- ensure => $ensure,
- package_checksum_type => $package_checksum_type,
- metadata_checksum_type => $metadata_checksum_type,
- compression_type => $compression_type,
- }
- liu_pulpcore_rpm_distribution { $title:
- ensure => $ensure,
- repository => $title,
- base_path => $title,
- }
-}
diff --git a/manifests/rpm_repos.pp b/manifests/rpm_repos.pp
deleted file mode 100644
index 6b39725..0000000
--- a/manifests/rpm_repos.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-class liu_pulpcore::rpm_repos (
- Hash $repos,
-) {
- $repos.each |$key, $data| {
- liu_pulpcore::rpm_repo { $key:
- * => $data,
- }
- }
-}
diff --git a/spec/defines/deb_repo_spec.rb b/spec/defines/deb_repo_spec.rb
deleted file mode 100644
index bb88d0b..0000000
--- a/spec/defines/deb_repo_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe 'liu_pulpcore::deb_repo' do
- let(:title) { 'namevar' }
- let(:params) do
- {
- ensure: 'present',
- url: 'https://dl.yarnpkg.com/debian',
- distributions: 'stable',
- }
- end
-
- on_supported_os.each do |os, os_facts|
- context "on #{os}" do
- let(:facts) { os_facts }
-
- it do
- is_expected.to compile
- is_expected.to contain_cron('repo_sync_namevar')
- is_expected.to contain_liu_pulpcore_deb_distribution('namevar')
- is_expected.to contain_liu_pulpcore_deb_remote('namevar')
- is_expected.to contain_liu_pulpcore_deb_repository('namevar')
- is_expected.to contain_liu_pulpcore_deb_publication('namevar')
- end
- end
- end
-end
diff --git a/spec/defines/rpm_repo_spec.rb b/spec/defines/rpm_repo_spec.rb
deleted file mode 100644
index 0d7575c..0000000
--- a/spec/defines/rpm_repo_spec.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe 'liu_pulpcore::rpm_repo' do
- let(:title) { 'namevar' }
- let(:params) do
- {
- ensure: 'present',
- url: 'https://yum.puppet.com/puppet7/el/7/x86_64/',
- }
- end
-
- on_supported_os.each do |os, os_facts|
- context "on #{os}" do
- let(:facts) { os_facts }
-
- it do
- is_expected.to compile
- is_expected.to contain_cron('repo_sync_namevar')
- is_expected.to contain_liu_pulpcore_rpm_distribution('namevar')
- is_expected.to contain_liu_pulpcore_rpm_remote('namevar')
- is_expected.to contain_liu_pulpcore_rpm_repository('namevar')
- end
- end
- end
-end
--
GitLab