Skip to content

Commit fa097d2

Browse files
committed
Add support for RGW service specification
1 parent 4877dac commit fa097d2

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

roles/cephadm/README.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,19 @@ All Ceph hosts must be in the `ceph` group.
7070
```
7171
* RGWs
7272
* `cephadm_radosgw_services`: List of Rados Gateways services to deploy. `id` is an arbitrary name for the service,
73-
`port` is a TCP port that RGW service should listen on. `count_per_host` is desired number of RGW services per host.
73+
`count_per_host` is desired number of RGW services per host. `spec` is optional additional service specification.
74+
Previously undocumented `port` variable is no longer supported.
7475
Example:
7576
```
7677
cephadm_radosgw_services:
7778
- id: myrgw
78-
port: 8000
7979
count_per_host: 2
80+
spec:
81+
rgw_realm: myrealm
82+
rgw_zone: myzone
83+
rgw_frontend_port: 1234
8084
```
81-
Note that adding RGW or other services to an existing deployment requires setting `cephadm_bootstrap` variable to *True*.
85+
Note that adding RGW or other services to an existing deployment requires setting `cephadm_bootstrap` variable to *True*.
8286
8387
* Registry
8488
* `cephadm_registry_url`: (default: not used)

roles/cephadm/templates/cluster.yml.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ placement:
4242
{% if service.count_per_host is defined %}
4343
count_per_host: {{ service.count_per_host }}
4444
{% endif %}
45-
{% if service.port is defined %}
45+
{% if service.spec is defined %}
4646
spec:
47-
rgw_frontend_port: {{ service.port }}
47+
{{ service.spec | to_nice_yaml }}
4848
{% endif %}
4949
{% endfor %}
5050
{% endif %}

0 commit comments

Comments
 (0)