From 0eee93089fc164bfd97eb96149a542d1b99c2d4b Mon Sep 17 00:00:00 2001 From: William Bradford Clark Date: Wed, 15 May 2024 11:24:02 -0400 Subject: [PATCH] remove *_repositories_staging_source variables from katello_devel --- roles/katello_devel/meta/main.yml | 2 -- roles/katello_repositories/tasks/staging_repos.yml | 1 - 2 files changed, 3 deletions(-) diff --git a/roles/katello_devel/meta/main.yml b/roles/katello_devel/meta/main.yml index ebcaad34a..2388a3ac0 100644 --- a/roles/katello_devel/meta/main.yml +++ b/roles/katello_devel/meta/main.yml @@ -4,9 +4,7 @@ dependencies: - role: foreman_server_repositories become: true foreman_server_repositories_katello: true - foreman_repositories_staging_source: 'stagingyum' foreman_server_repositories_foreman_client: true - katello_repositories_staging_source: 'stagingyum' # puppet 6 is still the default for theforeman.operations.puppet_repositories as of release 1.2.3 foreman_puppet_repositories_version: 7 - role: foreman_installer_devel_scenario diff --git a/roles/katello_repositories/tasks/staging_repos.yml b/roles/katello_repositories/tasks/staging_repos.yml index 7c3370e74..f8637f5bf 100644 --- a/roles/katello_repositories/tasks/staging_repos.yml +++ b/roles/katello_repositories/tasks/staging_repos.yml @@ -30,4 +30,3 @@ - name: 'Add Candlepin repository' include_role: name: candlepin_repositories - when: candlepin_repositories_version is defined or katello_repositories_staging_source == "stagingyum"