From fa1384aaa703a57882715c04dbc1ef2650b85705 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@golov.de>
Date: Tue, 9 Jan 2024 11:51:43 +0100
Subject: [PATCH] unconditionally enable ostree support

we do not support releases w/o ostree anymore
---
 pipelines/vars/forklift_katello.yml       | 4 ++--
 pipelines/vars/forklift_luna.yml          | 4 ++--
 playbooks/foreman_proxy_content.yml       | 2 +-
 playbooks/foreman_proxy_content_dev.yml   | 2 +-
 roles/foreman_installer/tasks/install.yml | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pipelines/vars/forklift_katello.yml b/pipelines/vars/forklift_katello.yml
index abf152871..2dc629352 100644
--- a/pipelines/vars/forklift_katello.yml
+++ b/pipelines/vars/forklift_katello.yml
@@ -12,7 +12,7 @@ server_box:
         - "--puppet-server-max-active-instances 1"
         - "--puppet-server-jvm-min-heap-size 1G"
         - "--puppet-server-jvm-max-heap-size 1G"
-        - "{{ '--foreman-proxy-content-enable-ostree true' if (pipeline_os != 'centos7') else '' }}"
+        - "--foreman-proxy-content-enable-ostree true"
       bats_tests_additional:
         - fb-katello-proxy.bats
         - "{{ 'fb-test-katello-change-hostname.bats' if pipeline_action == 'install' else ''}}"
@@ -27,6 +27,6 @@ proxy_box:
       foreman_installer_additional_packages:
         - "foreman-installer-katello"
       foreman_installer_options:
-        - "{{ '--foreman-proxy-content-enable-ostree true' if (pipeline_os != 'centos7') else '' }}"
+        - "--foreman-proxy-content-enable-ostree true"
 forklift_boxes:
   "{{ {forklift_server_name: server_box, forklift_proxy_name: proxy_box, forklift_smoker_name: smoker_box} }}"
diff --git a/pipelines/vars/forklift_luna.yml b/pipelines/vars/forklift_luna.yml
index 5d5710279..5dc89b4d4 100644
--- a/pipelines/vars/forklift_luna.yml
+++ b/pipelines/vars/forklift_luna.yml
@@ -62,7 +62,7 @@ server_box:
         - "--enable-foreman-cli-webhooks"
         - "--enable-foreman-plugin-webhooks"
 
-        - "{{ '--foreman-proxy-content-enable-ostree true' if (pipeline_os != 'centos7' and (pipeline_version == 'nightly' or pipeline_version is version('4.3', '>='))) else '' }}"
+        - "--foreman-proxy-content-enable-ostree true"
       bats_tests_additional:
         - "fb-test-foreman-rex.bats"
         - "fb-test-foreman-ansible.bats"
@@ -84,6 +84,6 @@ proxy_box:
         - "--enable-foreman-proxy-plugin-discovery"
         - "--enable-foreman-proxy-plugin-openscap"
         - "--enable-foreman-proxy-plugin-remote-execution-script"
-        - "{{ '--foreman-proxy-content-enable-ostree true' if (pipeline_os != 'centos7' and (pipeline_version == 'nightly' or pipeline_version is version('4.3', '>='))) else '' }}"
+        - "--foreman-proxy-content-enable-ostree true"
 forklift_boxes:
   "{{ {forklift_server_name: server_box, forklift_proxy_name: proxy_box, forklift_smoker_name: smoker_box} }}"
diff --git a/playbooks/foreman_proxy_content.yml b/playbooks/foreman_proxy_content.yml
index 5ba73c3bc..6f6c7b473 100644
--- a/playbooks/foreman_proxy_content.yml
+++ b/playbooks/foreman_proxy_content.yml
@@ -15,7 +15,7 @@
       foreman_installer_disable_system_checks: true
       foreman_installer_options_internal_use_only:
         - '--certs-tar-file "{{ foreman_proxy_content_certs_tar }}"'
-        - "{{ '--foreman-proxy-content-enable-ostree true' if (ansible_distribution_major_version != '7' and (foreman_repositories_version == 'nightly' or foreman_repositories_version is version('3.2', '>='))) else '' }}"
+        - "--foreman-proxy-content-enable-ostree true"
         - '--foreman-proxy-trusted-hosts "{{ server_fqdn }}"'
         - '--foreman-proxy-trusted-hosts "{{ ansible_nodename }}"'
         - '--foreman-proxy-foreman-base-url "https://{{ server_fqdn }}"'
diff --git a/playbooks/foreman_proxy_content_dev.yml b/playbooks/foreman_proxy_content_dev.yml
index 8e7d33fe8..650a66ab0 100644
--- a/playbooks/foreman_proxy_content_dev.yml
+++ b/playbooks/foreman_proxy_content_dev.yml
@@ -17,7 +17,7 @@
       foreman_installer_disable_system_checks: true
       foreman_installer_options_internal_use_only:
         - '--certs-tar-file "{{ foreman_proxy_content_certs_tar }}"'
-        - "{{ '--foreman-proxy-content-enable-ostree true' if (ansible_distribution_major_version != '7' and (foreman_repositories_version == 'nightly' or foreman_repositories_version is version('3.2', '>='))) else '' }}"
+        - "--foreman-proxy-content-enable-ostree true"
         - '--foreman-proxy-trusted-hosts "{{ server_fqdn }}"'
         - '--foreman-proxy-trusted-hosts "{{ ansible_nodename }}"'
         - '--foreman-proxy-foreman-base-url "https://{{ server_fqdn }}"'
diff --git a/roles/foreman_installer/tasks/install.yml b/roles/foreman_installer/tasks/install.yml
index e27828399..b641f07ee 100644
--- a/roles/foreman_installer/tasks/install.yml
+++ b/roles/foreman_installer/tasks/install.yml
@@ -8,7 +8,7 @@
 
 - name: 'Join options'
   set_fact:
-    foreman_installer_options_joined: "{{ foreman_installer_options | difference([] if foreman_installer_version is version('3.1', '>=') else ['--foreman-proxy-content-enable-ostree true']) | join(' ') }} {{ foreman_installer_options_internal_use_only | join(' ') }}"
+    foreman_installer_options_joined: "{{ foreman_installer_options | join(' ') }} {{ foreman_installer_options_internal_use_only | join(' ') }}"
 
 - name: 'Replace REX Script with REX SSH options for pre-3.3'
   set_fact: