Skip to content

Commit

Permalink
Move ceph validations to the check script (#1993)
Browse files Browse the repository at this point in the history
Signed-off-by: Christian Berendt <[email protected]>
  • Loading branch information
berendt authored Jan 14, 2024
1 parent d9fb1ca commit 98de40c
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 11 deletions.
13 changes: 13 additions & 0 deletions scripts/check/100-ceph-services.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ set -e

export INTERACTIVE=false

MANAGER_VERSION=$(docker inspect --format '{{ index .Config.Labels "org.opencontainers.image.version"}}' osism-ansible)

echo
echo "# Ceph status"
echo
Expand Down Expand Up @@ -39,3 +41,14 @@ echo "# Ceph free space status"
echo

ceph df

# osism validate is only available since 5.0.0. To enable the
# testbed to be used with < 5.0.0, here is this check.
if [[ $MANAGER_VERSION =~ ^4\.[0-9]\.[0-9]$ ]]; then
echo "ceph validate not possible with OSISM 4"
else
osism apply facts
osism validate ceph-mons
osism validate ceph-mgrs
osism validate ceph-osds
fi
11 changes: 0 additions & 11 deletions scripts/deploy/100-ceph-services-basic.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,3 @@ fi
if [[ $MANAGER_VERSION == "latest" && $CEPH_VERSION == "pacific" ]]; then
sed -i "s/community.general.yaml/osism.commons.still_alive/" /opt/configuration/environments/ansible.cfg
fi

# osism validate is only available since 5.0.0. To enable the
# testbed to be used with < 5.0.0, here is this check.
if [[ $MANAGER_VERSION =~ ^4\.[0-9]\.[0-9]$ ]]; then
echo "ceph validate not possible with OSISM 4"
else
osism apply facts
osism validate ceph-mons
osism validate ceph-mgrs
osism validate ceph-osds
fi

0 comments on commit 98de40c

Please sign in to comment.