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

New Squid branch #320

Merged
merged 1 commit into from
Sep 18, 2024
Merged

New Squid branch #320

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
6 changes: 3 additions & 3 deletions ceph_defaults/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
ceph_origin: community
ceph_dev_branch: main
ceph_dev_sha1: latest
ceph_rhcs_version: 5
ceph_ibm_version: 5
ceph_rhcs_version: 8
ceph_ibm_version: 8
ceph_mirror: https://download.ceph.com
ceph_stable_key: https://download.ceph.com/keys/release.asc
ceph_community_repo_baseurl: "{{ ceph_mirror }}/rpm-{{ ceph_release }}/el{{ ansible_facts['distribution_major_version'] }}/"
ceph_ibm_repo_baseurl: "https://public.dhe.ibm.com/ibmdl/export/pub/storage/ceph/{{ ceph_ibm_version }}/rhel{{ ansible_facts['distribution_major_version'] }}/"
ceph_ibm_key: https://public.dhe.ibm.com/ibmdl/export/pub/storage/ceph/RPM-GPG-KEY-IBM-CEPH
ceph_release: quincy
ceph_release: squid
upgrade_ceph_packages: false
ceph_pkgs:
- cephadm
Expand Down
4 changes: 2 additions & 2 deletions ceph_defaults/meta/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ galaxy_info:
author: Guillaume Abrioux
description: Handles ceph-ansible default vars for all roles
license: Apache
min_ansible_version: 2.10
min_ansible_version: 2.15
platforms:
- name: Ubuntu
versions:
- bionic
- name: EL
versions:
- 8
- 9
galaxy_tags:
- system
dependencies: []
19 changes: 3 additions & 16 deletions cephadm-preflight.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,7 @@
become: true
gather_facts: true
vars:
repos_4_to_disable:
- rhceph-4-tools-for-rhel-{{ ansible_facts['distribution_major_version'] }}-{{ ansible_facts['architecture'] }}-rpms
- rhceph-4-mon-for-rhel-{{ ansible_facts['distribution_major_version'] }}-{{ ansible_facts['architecture'] }}-rpms
- rhceph-4-osd-for-rhel-{{ ansible_facts['distribution_major_version'] }}-{{ ansible_facts['architecture'] }}-rpms
repos_5_to_disable:
- rhceph-5-tools-for-rhel-{{ ansible_facts['distribution_major_version'] }}-{{ ansible_facts['architecture'] }}-rpms
repos_6_to_disable:
- rhceph-6-tools-for-rhel-{{ ansible_facts['distribution_major_version'] }}-{{ ansible_facts['architecture'] }}-rpms
repos_to_disable: "{{ range(5, ceph_rhcs_version) | map('string') | map('regex_replace', '^', 'rhceph_') | map('regex_replace', '$', '-tools-for-rhel-' + ansible_facts['distribution_major_version'] + '-' + ansible_facts['architecture'] + '-rpms') | list }}"
packages_to_uninstall:
- ceph-mds
- ceph-mgr
Expand All @@ -56,15 +49,9 @@
name: "rhceph-{{ ceph_rhcs_version }}-tools-for-rhel-{{ ansible_facts['distribution_major_version'] }}-{{ ansible_facts['architecture'] }}-rpms"

- name: disable older rhceph repositories if any on RHEL{{ansible_facts['distribution_major_version']}}
when: ansible_facts['distribution_major_version'] == '8'
when: ansible_facts['distribution_major_version'] <= '8'
rhsm_repository:
name: "{{ repos_4_to_disable + repos_5_to_disable }}"
state: absent

- name: disable older rhceph repositories if any on RHEL{{ansible_facts['distribution_major_version']}}
when: ansible_facts['distribution_major_version'] == '9'
rhsm_repository:
name: "{{ repos_5_to_disable + repos_6_to_disable }}"
name: "{{ repos_to_disable }}"
state: absent

- name: enable ceph package repositories
Expand Down
2 changes: 1 addition & 1 deletion doc/source/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
author = 'Guillaume Abrioux'

# The full version, including alpha/beta/rc tags
release = 'v2.0'
release = 'v4.0'


# -- General configuration ---------------------------------------------------
Expand Down
Loading