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.

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

Use ansible_user_dir in customize_home role #1760

Merged
merged 4 commits into from
Feb 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion pipelines/katello_devel/02-install.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
- hosts:
- pipeline-katello-devel-centos7
- pipeline-katello-devel-centos8
become: yes
vars_files:
- ../vars/repos_staging.yml
Expand Down
8 changes: 1 addition & 7 deletions pipelines/katello_devel/03-tests.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
---
- hosts:
- pipeline-katello-devel-centos7
- pipeline-katello-devel-centos8
become: yes
vars_files:
- ../vars/repos_staging.yml
roles:
- role: ruby_scl
when: ansible_distribution_major_version == "7"
- role: nodejs_scl
when: ansible_distribution_major_version == "7"
- role: postgresql_scl
when: ansible_distribution_major_version == "7"
- katello_test
6 changes: 3 additions & 3 deletions pipelines/vars/katello_devel.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
forklift_name: pipeline-katello-devel-centos7
forklift_name: pipeline-katello-devel-centos8
forklift_boxes:
pipeline-katello-devel-centos7:
box: centos7
pipeline-katello-devel-centos8:
box: centos8-stream
memory: 8192
variables:
katello_repositories_version: nightly
Expand Down
1 change: 0 additions & 1 deletion playbooks/katello_devel.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---
- hosts: all
become: true
roles:
- katello_devel
4 changes: 2 additions & 2 deletions roles/customize_home/tasks/fix_env.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
- name: Check that the .env exists
stat:
path: /home/vagrant/foreman/.env
path: "{{ ansible_user_dir }}/foreman/.env"
register: stat_result

- name: Ensure .env file contains current hostname
ansible.builtin.replace:
path: /home/vagrant/foreman/.env
path: "{{ ansible_user_dir }}/foreman/.env"
regexp: '(.*)--public [a-zA-Z0-9-\.]*(.*)'
replace: '\1--public {{ ansible_fqdn }}\2'
when: stat_result
10 changes: 3 additions & 7 deletions roles/katello_devel/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,20 @@
dependencies:
- role: etc_hosts
wbclark marked this conversation as resolved.
Show resolved Hide resolved
- role: foreman_server_repositories
become: true
foreman_server_repositories_katello: true
foreman_server_repositories_foreman_client: true
# puppet 6 is still the default for theforeman.operations.puppet_repositories as of release 1.2.3
foreman_puppet_repositories_version: 7
- role: ruby_scl
when: ansible_distribution_major_version == "7"
- role: nodejs_scl
when: ansible_distribution_major_version == "7"
- role: postgresql_scl
when: ansible_distribution_major_version == "7"
- role: foreman_installer_devel_scenario
become: true
- role: foreman_installer
become: true
foreman_installer_scenario: katello-devel
foreman_installer_additional_packages:
- foreman-installer-katello
foreman_installer_disable_system_checks: true
foreman_installer_options_internal_use_only:
- "{{ '--katello-devel-scl-ruby=' + ruby_scl_version if ansible_distribution_major_version == '7' else '' }}"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(this was already removed in puppet-katello_devel)

- "--katello-devel-admin-password {{ foreman_installer_admin_password }}"
- "{{ '--katello-devel-github-username=' + katello_devel_github_username if katello_devel_github_username is defined else '' }}"
- role: customize_home
2 changes: 0 additions & 2 deletions roles/nodejs_scl/defaults/main.yml

This file was deleted.

18 changes: 0 additions & 18 deletions roles/nodejs_scl/tasks/main.yml

This file was deleted.

2 changes: 0 additions & 2 deletions roles/postgresql_scl/defaults/main.yml

This file was deleted.

19 changes: 0 additions & 19 deletions roles/postgresql_scl/tasks/main.yml

This file was deleted.

Loading