Skip to content

Commit

Permalink
Merge pull request #618 from ceph/wip-releasever-sooner
Browse files Browse the repository at this point in the history
common: Set releasever on testnodes sooner
  • Loading branch information
zmc authored Apr 8, 2021
2 parents 7d6f1c4 + 73c59fe commit 581bd5b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
10 changes: 10 additions & 0 deletions roles/common/tasks/rhel-entitlements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,16 @@
validate_certs: no
when: use_satellite == true

# set the releasever cause without it rhel-7-server-rpms repo fails on rhel7.9 machines
# https://tracker.ceph.com/issues/49771
# We have to do this here (instead of in testnodes role) because some package transactions fail during the common role.
# However, we do not want to lock the release ver on all our systems; just testnodes.
- name: Set the releasever
copy:
content: "{{ ansible_lsb.release }}"
dest: /etc/yum/vars/releasever
when: inventory_hostname in groups['testnodes']

- name: Determine if node is registered with subscription-manager.
command: subscription-manager identity
register: subscription
Expand Down
7 changes: 0 additions & 7 deletions roles/testnode/tasks/yum/repos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,3 @@
when: (repo_file is defined and repo_file is changed) or
(gpg_keys is defined and gpg_keys is changed) or
(version_repo_file is defined and version_repo_file is changed)

# set the releasever cause without it rhel-7-server-rpms repo fails on rhel7.9 machines https://tracker.ceph.com/issues/49771
- name: set the releasevar on rhel
copy:
content: "{{ ansible_lsb.release }}"
dest: /etc/yum/vars/releasever
when: ansible_distribution == "RedHat"

0 comments on commit 581bd5b

Please sign in to comment.