From 7fd8004cb3c31a30e40aeae9f83d184bbe48cee2 Mon Sep 17 00:00:00 2001 From: Markus Bucher Date: Thu, 31 Aug 2023 12:03:16 +0200 Subject: [PATCH] Fix installation of non-develop katello-devel box requires https://github.com/theforeman/puppet-katello_devel/commit/e276ccbfc9703501a57ab0df484a9a1af54d0de7 Co-authored-by: Ewoud Kohl van Wijngaarden --- roles/katello_devel/meta/main.yml | 3 +++ vagrant/boxes.d/99-local.yaml.example | 23 +++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/roles/katello_devel/meta/main.yml b/roles/katello_devel/meta/main.yml index 2388a3ac0..23dbefd9d 100644 --- a/roles/katello_devel/meta/main.yml +++ b/roles/katello_devel/meta/main.yml @@ -20,4 +20,7 @@ dependencies: - "{{ '--katello-devel-github-username=' + katello_devel_github_username if katello_devel_github_username is defined else '' }}" - "--katello-devel-extra-plugins theforeman/foreman_rh_cloud" - "--katello-devel-extra-plugins theforeman/foreman_virt_who_configure" + - "--katello-devel-foreman-scm-revision={{ foreman_repositories_version is defined | ternary(foreman_repositories_version + '-stable', 'develop') }}" + - "--katello-devel-katello-scm-revision={{ katello_repositories_version is defined | ternary('KATELLO-' + katello_repositories_version, 'master') }}" + - "--katello-devel-rex-scm-revision={{ foreman_remote_execution_scm_version | default('master') }}" - role: customize_home diff --git a/vagrant/boxes.d/99-local.yaml.example b/vagrant/boxes.d/99-local.yaml.example index 2ca62084d..2de63a456 100644 --- a/vagrant/boxes.d/99-local.yaml.example +++ b/vagrant/boxes.d/99-local.yaml.example @@ -1,4 +1,27 @@ --- +alma8-katello-47-devel: + primary: true + box: almalinux8 + hostname: alma8-katello-411-devel.example.com + ansible: + playbook: 'playbooks/katello_devel.yml' + group: 'devel' + variables: + ssh_forward_agent: true + foreman_devel_github_push_ssh: True + katello_devel_github_username: + foreman_repositories_environment: staging + katello_repositories_environment: staging + foreman_repositories_version: "3.9" + foreman_client_repositories_version: "3.9" + katello_repositories_version: "4.11" + pulpcore_repositories_version: "3.39" + foreman_puppet_repositories_version: 7 + foreman_remote_execution_scm_version: "12.0.z" + foreman_installer_options: + - "--foreman-proxy-content-enable-ostree=true" + - "--katello-devel-modulestream-nodejs=14" + centos9-katello-devel: primary: true box: centos9-stream