[multiple] nova05epsilon: adjust Ceph for BM SNO DCN cases#3773
[multiple] nova05epsilon: adjust Ceph for BM SNO DCN cases#3773bogdando wants to merge 3 commits into
Conversation
|
Skipping CI for Draft Pull Request. |
|
This PR is stale because it has been for over 15 days with no activity. |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
bogdando
changed the title
|
This PR is stale because it has been for over 15 days with no activity. |
bogdando
changed the title
bogdando
changed the title
bogdando
force-pushed
the
nova05epsilon
branch
3 times, most recently
from
84314e0 to
f9d684c
Compare
|
Build failed (check pipeline). Post ❌ openstack-k8s-operators-content-provider NODE_FAILURE Node(set) request 100-0000095747 failed in 0s |
|
Build failed (check pipeline). Post ✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 50m 26s |
|
recheck cifmw-crc-podified-edpm-baremetal |
|
This looks like it should be fine to me. Let's confirm with a test project. Nit: The commit message says something about "Add computes to zuul inventory" but I don't see that in the changed files. |
+1 I agree, looks ok but testprojects w/ the Ceph related scenarios will confirm. |
|
Build failed (check pipeline). Post ✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 51m 29s |
|
Build failed (check pipeline). Post ✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 23m 57s |
|
recheck cifmw-pod-ansible-test |
bogdando
force-pushed
the
nova05epsilon
branch
4 times, most recently
from
ee7331e to
b078db7
Compare
|
Build failed (check pipeline). Post ✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 25m 30s |
The ceph.yml post_stage_run hook (via cifmw_ceph_client role) writes Ceph config files to cifmw_ceph_client_fetch_dir (default /tmp/). This template reads those files and provides them as base64-encoded values under data.ceph_conf (DCN convention). Generated-by: claude-4.6-opus-high Signed-off-by: Bohdan Dobrelia <bdobreli@redhat.com>
To allow BM SNO with ceph using custom ceph CIDR values, make ssh_network_range and storage_mgmt_network_range overridable via cifmw_ceph_ssh_network_range and cifmw_ceph_storage_mgmt_network_range. Both are set in set_fact which clobbers extra vars, so we use the cifmw_ indirection with default() to preserve original defaults. NOTE: storage_network_range also needs this treatment. It use to be commented out in set_fact, and this change needs extra testing with Ceph ci jobs perhaps. Also gather network facts for IP-to-host mapping. Signed-off-by: Bohdan Dobrelia <bdobreli@redhat.com>
|
Build failed (check pipeline). Post ✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 16m 28s |
On SNO with a single EDPM compute (single-host CephHCI), the Ceph ingress service (haproxy/keepalived) is not deployed because the ceph_rgw.yml.j2 spec template only creates it for multi-host clusters. Parameterize RGW port to correct the Keystone Swift endpoint for SNO. Change the VIP detection logic so that if cifmw_cephadm_rgw_vip is pre-set (e.g. to the host's storage IP for SNO cases) - it's preserved. Otherwise it falls back to cifmw_cephadm_vip (the ingress VIP) as before. Users will be able to chose from VIP:8080 vs host_ip:8082 accordingly. Signed-off-by: Bohdan Dobrelia <bdobreli@redhat.com>
|
downstream testproject passed tempest tests, the horizon test failures are unrelated |
3 participants
Adjust ceph.yml post_stage_run hook for DCN conventions
The ceph.yml post_stage_run hook (via cifmw_ceph_client role) writes Ceph config files to
cifmw_ceph_client_fetch_dir (default /tmp/). This template reads those files and provides them as base64-
encoded values under data.ceph_conf (DCN convention).
Allow overriding ssh and storage_mgmt
To allow BM SNO with ceph using custom ceph CIDR values,
make ssh_network_range and storage_mgmt_network_range overridable via
cifmw_ceph_ssh_network_range and cifmw_ceph_storage_mgmt_network_range.
Both are set in set_fact which clobbers extra vars, so we use the
cifmw_ indirection with default() to preserve original defaults.
NOTE: storage_network_range also needs this treatment.
It use to be commented out in set_fact, and this change needs
extra testing with Ceph ci jobs perhaps.
Also gather network facts for IP-to-host mapping.
Fix Swift by Ceph RGW on SNO setup
On SNO with a single EDPM compute (single-host CephHCI), the Ceph
ingress service (haproxy/keepalived) is not deployed because the
ceph_rgw.yml.j2 spec template only creates it for multi-host clusters.
Parameterize RGW port to correct the Keystone Swift endpoint for SNO.
Change the VIP detection logic so that if cifmw_cephadm_rgw_vip
is pre-set (e.g. to the host's storage IP for SNO cases) - it's
preserved. Otherwise it falls back to cifmw_cephadm_vip
(the ingress VIP) as before.
Users will be able to chose from VIP:8080 vs host_ip:8082 accordingly.
Jira: OSPRH-27641
Generated-by: claude-4.6-opus-high