Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

unconditionally enable ostree support #1755

Merged
merged 1 commit into from
Jan 9, 2024
Merged

unconditionally enable ostree support #1755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pipelines/vars/forklift_katello.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ''}}"
Expand All @@ -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} }}"
4 changes: 2 additions & 2 deletions pipelines/vars/forklift_luna.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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} }}"
2 changes: 1 addition & 1 deletion playbooks/foreman_proxy_content.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"'
Expand Down
2 changes: 1 addition & 1 deletion playbooks/foreman_proxy_content_dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"'
Expand Down
2 changes: 1 addition & 1 deletion roles/foreman_installer/tasks/install.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading