From b375a39cb9c0e3c82400bbf53672db0f171d0f8c 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 f116c2c5e..fededa0f4 100644 --- a/roles/katello_devel/meta/main.yml +++ b/roles/katello_devel/meta/main.yml @@ -22,4 +22,7 @@ dependencies: - "{{ '--katello-devel-scl-ruby=' + ruby_scl_version if ansible_distribution_major_version == '7' else '' }}" - "--katello-devel-admin-password {{ foreman_installer_admin_password }}" - "{{ '--katello-devel-github-username=' + katello_devel_github_username if katello_devel_github_username is defined else '' }}" + - "--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 f72a82968..e36e96ed9 100644 --- a/vagrant/boxes.d/99-local.yaml.example +++ b/vagrant/boxes.d/99-local.yaml.example @@ -1,4 +1,27 @@ --- +centos8-katello-47-devel: + primary: true + box: centos8-stream + hostname: centos8-katello-47-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.5" + foreman_client_repositories_version: "3.5" + katello_repositories_version: "4.7" + pulpcore_repositories_version: "3.21" + foreman_puppet_repositories_version: 7 + foreman_remote_execution_scm_version: "8.2.z" + foreman_installer_options: + - "--foreman-proxy-content-enable-ostree=true" + - "--katello-devel-modulestream-nodejs=12" + centos8-katello-devel: primary: true box: centos8-stream