Skip to content

Improve RADOS GW support #68

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
merged 4 commits into from
Sep 29, 2022
Merged

Improve RADOS GW support #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4938b3c
Create more consistent cluster specs
cityofships Sep 26, 2022
4c26669
Add basic docs for Rados GW
cityofships Sep 26, 2022
4877dac
Add support for multiple RGWs per host
cityofships Sep 26, 2022
fa097d2
Add support for RGW service specification
cityofships Sep 28, 2022
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
2 changes: 1 addition & 1 deletion galaxy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace: "stackhpc"
name: "cephadm"
version: "1.9.0"
version: "1.10.0"
readme: "README.md"
authors:
- "Michal Nasiadka"
Expand Down
15 changes: 15 additions & 0 deletions roles/cephadm/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,21 @@ All Ceph hosts must be in the `ceph` group.
db_devices:
model: Dell Express Flash PM1725b 1.6TB SFF
```
* RGWs
* `cephadm_radosgw_services`: List of Rados Gateways services to deploy. `id` is an arbitrary name for the service,
`count_per_host` is desired number of RGW services per host. `spec` is optional additional service specification.
Previously undocumented `port` variable is no longer supported.
Example:
```
cephadm_radosgw_services:
- id: myrgw
count_per_host: 2
spec:
rgw_realm: myrealm
rgw_zone: myzone
rgw_frontend_port: 1234
```
Note that adding RGW or other services to an existing deployment requires setting `cephadm_bootstrap` variable to *True*.

* Registry
* `cephadm_registry_url`: (default: not used)
Expand Down
24 changes: 14 additions & 10 deletions roles/cephadm/templates/cluster.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,29 @@ hostname: {{ hostvars[host].ansible_facts.hostname }}
addr: {{ hostvars[host].ansible_facts[cephadm_admin_interface]['ipv4']['address'] }}
labels:
{% if host in groups['mons'] %}
- _admin
- mon
- _admin
- mon
{% endif %}
{% if host in groups['mgrs'] %}
- mgr
- mgr
{% endif %}
{% if host in groups['osds'] %}
- osd
- osd
{% endif %}
{% if host in groups.get('rgws', []) %}
- rgw
- rgw
{% endif %}
{% endfor %}
---
service_type: mon
placement:
count: {{ cephadm_mon_count }}
label: "mon"
label: mon
---
service_type: mgr
placement:
count: {{ cephadm_mgr_count }}
label: "mgr"
label: mgr
---
service_type: crash
placement:
Expand All @@ -38,9 +38,13 @@ placement:
service_type: rgw
service_id: {{ service.id }}
placement:
label: "rgw"
{% if service.port is defined %}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not backwards compatible, and will break anyone using port.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Discussed with @mnasiadka, nobody was using it; it's mentioned in the Readme too.

rgw_frontend_port: {{ service.port }}
label: rgw
{% if service.count_per_host is defined %}
count_per_host: {{ service.count_per_host }}
{% endif %}
{% if service.spec is defined %}
spec:
{{ service.spec | to_nice_yaml }}
{% endif %}
{% endfor %}
{% endif %}