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

feat: Use ceph release name instead of version #12

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: Use ceph release name instead of version #12

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
7 changes: 3 additions & 4 deletions .github/workflows/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,14 @@ jobs:
fail-fast: false
matrix:
version:
- 16.2.9
- 17.2.6
- pacific
- quincy
scenario:
- aio
- ha
distro:
- ubuntu2004
# NOTE(mnaser): There are no Jammy packages for Ceph yet.
# - ubuntu2204
- ubuntu2204
steps:
- name: Checkout project
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion molecule/aio/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ provisioner:
group_vars:
all:
ceph_fsid: ${MOLECULE_CEPH_FSID:-"1dff0e0f-3c44-48da-81cd-4f3c6e8722b2"}
ceph_version: ${MOLECULE_CEPH_VERSION:-"16.2.9"}
ceph_release_name: ${MOLECULE_CEPH_VERSION:-"pacific"}
ceph_conf_overrides:
- section: global
option: osd crush chooseleaf type
Expand Down
2 changes: 1 addition & 1 deletion molecule/ha/molecule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ provisioner:
group_vars:
all:
ceph_fsid: ${MOLECULE_CEPH_FSID:-"1dff0e0f-3c44-48da-81cd-4f3c6e8722b2"}
ceph_version: ${MOLECULE_CEPH_VERSION:-"16.2.9"}
ceph_release_name: ${MOLECULE_CEPH_VERSION:-"pacific"}
ceph_conf_overrides:
- section: mon
option: auth allow insecure global id reclaim
Expand Down
2 changes: 1 addition & 1 deletion roles/osd/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
ansible.builtin.apt:
name: ["ceph-volume"]
install_recommends: false
when: ceph_repository_version is ansible.builtin.version("17.2", '>=')
when: ceph_release_name in ["quincy"]

- name: Collect "ceph mon dump" output from a monitor
delegate_to: "{{ groups[ceph_osd_mons_group][0] }}"
Expand Down
6 changes: 3 additions & 3 deletions roles/repository/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
# License for the specific language governing permissions and limitations
# under the License.

# Ceph version to pin package manager to
ceph_repository_version: "{{ ceph_version | default('16.2.9') }}"
# Ceph release name to pin package manager to. Pacific and Quincy are supported.
ceph_release_name: "pacific"

# Ceph APT repository URL
ceph_repository_url: https://download.ceph.com/debian-{{ ceph_repository_version }}/
ceph_repository_url: https://download.ceph.com/debian-{{ ceph_release_name }}/
6 changes: 3 additions & 3 deletions roles/repository/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
# License for the specific language governing permissions and limitations
# under the License.

- name: Check if ceph_repository_version minimal 16.2
- name: Check if ceph_release_name is in the support list

Check failure on line 15 in roles/repository/tasks/main.yml

View workflow job for this annotation

GitHub Actions / ansible-lint

yaml[trailing-spaces] 

Trailing spaces
ansible.builtin.fail:
msg: ceph_repository_version older then 16.2 or has the incorrect format.
when: ceph_repository_version is not ansible.builtin.version("16.2", '>=')
msg: ceph_release_name should be pacific or quincy.
when: ceph_release_name not in ["pacific", "quincy"]

- name: Install packages
ansible.builtin.apt:
Expand Down
Loading