Skip to content

Cherry pick 15115 #15148

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

Merged
petr-balogh merged 2 commits into from
May 14, 2026
Merged

Cherry pick 15115 #15148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b066ff
Merge pull request #15115 from shivamdurgbuns/bug/rgwssldeployment_fix
shivamdurgbuns May 14, 2026
07a4980
Assuming ceph version is >= 19 if not determined for ODF 4.18 and above
petr-balogh May 14, 2026
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
40 changes: 20 additions & 20 deletions .secrets.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,159 +625,159 @@
"hashed_secret": "a12337323b638ab044b1166bff4b1a1f83162819",
"is_secret": false,
"is_verified": false,
"line_number": 825,
"line_number": 826,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "fb947972c92f052c0a08866d182be0075a2b601b",
"is_secret": false,
"is_verified": false,
"line_number": 834,
"line_number": 835,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "03e227627ab8681281fdb8aa3d799b03f782d672",
"is_secret": false,
"is_verified": false,
"line_number": 2014,
"line_number": 2015,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "ef5f3d909f23bd0aa02b4253f98350384f709c86",
"is_secret": false,
"is_verified": false,
"line_number": 2121,
"line_number": 2122,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "cb1ae2b504c4615841d8144267a131231d2bd677",
"is_secret": false,
"is_verified": false,
"line_number": 2122,
"line_number": 2123,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "1a1e70e87dd0452c42f33ce9bf74aa28134dba6b",
"is_secret": false,
"is_verified": false,
"line_number": 2123,
"line_number": 2124,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "7b1ba2f04f2f1604dc4e3caffcadf9fcbce7df5b",
"is_secret": false,
"is_verified": false,
"line_number": 2124,
"line_number": 2125,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "0fa3b21ced80146d752888f2b60ec80e0d4b8925",
"is_secret": false,
"is_verified": false,
"line_number": 2129,
"line_number": 2130,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "f084f2068494b8d1cd06811dd97d02c3d85f40ee",
"is_secret": false,
"is_verified": false,
"line_number": 2144,
"line_number": 2145,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "adfa401a3b0a733d8f00519ac8c6b3893a2e7e8e",
"is_secret": false,
"is_verified": false,
"line_number": 2145,
"line_number": 2146,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "898e46bbadc12f87120548bd445eb4210c8407c8",
"is_secret": false,
"is_verified": false,
"line_number": 2153,
"line_number": 2154,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "f57ccec6b8f7b12b635ab53d26c3bf7300247341",
"is_secret": false,
"is_verified": false,
"line_number": 2154,
"line_number": 2155,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "77b044ea736f8cbe568d1954424186d901f89db9",
"is_secret": false,
"is_verified": false,
"line_number": 2155,
"line_number": 2156,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "d64368f12ca17c69568c6a132f17d44d56e60660",
"is_secret": false,
"is_verified": false,
"line_number": 2156,
"line_number": 2157,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "8f9ca35156c02cb6ba58c5b51230b9bedc38de4f",
"is_secret": false,
"is_verified": false,
"line_number": 2157,
"line_number": 2158,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "9ec53cfd9929c70c3f87c210b6a7b77fb6d79d43",
"is_secret": false,
"is_verified": false,
"line_number": 2740,
"line_number": 2743,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "ee977806d7286510da8b9a7492ba58e2484c0ecc",
"is_secret": false,
"is_verified": false,
"line_number": 2897,
"line_number": 2900,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "adc1f5c8707f7d7aba3aabe13c15e5ef1151872e",
"is_secret": false,
"is_verified": false,
"line_number": 2898,
"line_number": 2901,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "ee46262b2df945e46ea310b925ad087465dbd3f2",
"is_secret": false,
"is_verified": false,
"line_number": 3619,
"line_number": 3622,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "f678cad4ab874d71b559a069d5e34a95fe38a480",
"is_secret": false,
"is_verified": false,
"line_number": 3620,
"line_number": 3623,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down
3 changes: 2 additions & 1 deletion conf/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,8 @@ Configuration specific to external Ceph cluster
* `key` - Admin keyring value used for the external Ceph cluster
* `external_cluster_details` - base64 encoded data of json output from exporter script
* `rgw_secure` - boolean parameter which defines if external Ceph cluster RGW is secured using SSL
* `rgw_cert_ca` - url pointing to CA certificate used to sign certificate for RGW with SSL
* `rgw_cert_ca` - URL for the RGW signing CA when external Ceph is **below 19.0**, or as a **fallback** if cephadm CA fetch fails on 19.0+
* For external Ceph **19.0 and newer**, ocs-ci runs ``ceph orch certmgr cert get cephadm_root_ca_cert`` via ``cephadm shell`` on the ``_admin`` node (``get_external_cluster_client("_admin")``, falling back to ``node1``) instead of using ``rgw_cert_ca``, unless that command fails
* `use_rbd_namespace` - boolean parameter to use RBD namespace in pool
* `rbd_namespace` - Name of RBD namespace to use in pool

Expand Down
Loading
Loading