Skip to content

Commit

Permalink
qa/suites/orch/cephadm: add 8.stream + container_tools
Browse files Browse the repository at this point in the history
Signed-off-by: Sage Weil <[email protected]>
  • Loading branch information
liewegas committed Nov 10, 2021
1 parent ed18f0a commit eb43f2b
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 12 deletions.
14 changes: 14 additions & 0 deletions qa/distros/podman/centos_8.stream_container_tools.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
os_type: centos
os_version: "8.stream"
overrides:
selinux:
whitelist:
- scontext=system_u:system_r:logrotate_t:s0

tasks:
- pexec:
all:
- sudo cp /etc/containers/registries.conf /etc/containers/registries.conf.backup
- sudo dnf -y module reset container-tools
- sudo dnf -y module install container-tools
- sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
os_type: centos
os_version: "8.3"
overrides:
selinux:
whitelist:
- scontext=system_u:system_r:logrotate_t:s0
os_version: "8.stream"

tasks:
- pexec:
all:
- sudo cp /etc/containers/registries.conf /etc/containers/registries.conf.backup
- sudo dnf -y module reset container-tools
- sudo dnf -y module install container-tools
- sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf
- cephadm:
image: quay.ceph.io/ceph-ci/ceph:octopus
cephadm_branch: octopus
image: docker.io/ceph/ceph:v15.2.0
cephadm_branch: v15.2.0
cephadm_git_url: https://github.com/ceph/ceph
# avoid --cap-add=PTRACE + --privileged for older cephadm versions
allow_ptrace: false
# deploy additional mons the "old" (octopus) way
add_mons_via_daemon_add: true
avoid_pacific_features: true


roles:
- - mon.a
- mon.c
Expand All @@ -26,7 +27,7 @@ roles:
- osd.2
- osd.3
- client.0
# - ceph.rgw.realm.zone.a # CLI change in v16 pacific
# - ceph.rgw.realm.zone.a # Disabled, needs 15.2.4 as an upgrade start
- node-exporter.a
- alertmanager.a
- - mon.b
Expand All @@ -39,4 +40,4 @@ roles:
- prometheus.a
- grafana.a
- node-exporter.b
- ceph.iscsi.iscsi.a
# - ceph.iscsi.iscsi.a # needs later start point

0 comments on commit eb43f2b

Please sign in to comment.