Skip to content

Commit 13b6b36

Browse files
committed
Update Ceph container in standalone for adoption
Recently we bumped the ceph version for the multinode [1], we need the same changes for the standalone as well. [1] #930
1 parent 56ac8ec commit 13b6b36

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

devsetup/scripts/standalone.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,9 @@ else
147147
--output-env-file \$HOME/containers-prepare-parameters.yaml
148148
# Use wallaby el9 container images
149149
sed -i 's|quay.io/tripleowallaby$|quay.io/tripleowallabycentos9|' \$HOME/containers-prepare-parameters.yaml
150+
# Adoption requires Ceph 7 (Reef) as a requirement. Instead of performing a Ceph
151+
# upgrade from 6 (the default) to 7, let's try to deploy 7 in greenfield
152+
sed -i "s|rhceph-6-rhel9|rhceph-7-rhel9|" \$HOME/containers-prepare-parameters.yaml
150153
fi
151154
152155
# Use os-net-config to add VLAN interfaces which connect edpm-compute-0 to the isolated networks configured by install_yamls.

devsetup/standalone/ceph.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@ osd pool default size = 1
6060
mon_warn_on_pool_no_redundancy = false
6161
EOF
6262

63+
# NOTE: TripleO has the hardcoded --yes-i-know option that is not valid anymore
64+
# in RHCS 7. TripleO does not receive any new patch both upstream and downstream
65+
# (it is a retired project), hence the only option we have is to patch the
66+
# current code to not have that line.
67+
sudo sed -i "/--yes-i-know/d" /usr/share/ansible/roles/tripleo_cephadm/tasks/bootstrap.yaml
68+
6369
# Use the files created in the previous steps to install Ceph.
6470
# Use thw network_data.yaml file so that Ceph uses the isolated networks for storage and storage management.
6571
sudo openstack overcloud ceph deploy \
@@ -73,7 +79,7 @@ sudo openstack overcloud ceph deploy \
7379
--skip-container-registry-config \
7480
--skip-user-create \
7581
--network-data /tmp/network_data.yaml \
76-
--ntp-server $NTP_SERVER \
82+
--ntp-server "$NTP_SERVER" \
7783
--output $HOME/deployed_ceph.yaml
7884

7985
# Ceph should now be installed. Use sudo cephadm shell -- ceph -s to confirm the Ceph cluster health.

0 commit comments

Comments
 (0)