Skip to content

Commit 0aaed81

Browse files
committed
Fix indentation & use internal fqdn
1 parent 32dda21 commit 0aaed81

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

doc/source/configuration/cephadm.rst

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -316,10 +316,10 @@ RGWs are defined with the following:
316316
.. code:: yaml
317317
318318
cephadm_radosgw_services:
319-
- id: myrgw
320-
count_per_host: 1
321-
spec:
322-
rgw_frontend_port: 80
319+
- id: myrgw
320+
count_per_host: 1
321+
spec:
322+
rgw_frontend_port: 80
323323
324324
Ceph RGWs require additional configuration to:
325325

@@ -345,7 +345,7 @@ The set of commands below configure all of these.
345345
- "config set client.rgw rgw_keystone_admin_user 'ceph_rgw'"
346346
- "config set client.rgw rgw_keystone_api_version '3'"
347347
- "config set client.rgw rgw_keystone_token_cache_size '10000'"
348-
- "config set client.rgw rgw_keystone_url https://{{ internal_net_vip_address }}:5000"
348+
- "config set client.rgw rgw_keystone_url https://{{ kolla_internal_fqdn }}:5000"
349349
- "config set client.rgw rgw_keystone_verify_ssl false"
350350
- "config set client.rgw rgw_max_attr_name_len '1000'"
351351
- "config set client.rgw rgw_max_attr_size '1000'"
@@ -394,15 +394,15 @@ add definitions of your Ceph hosts to Kolla ``globals.yml``:
394394
.. code:: yaml
395395
396396
ceph_rgw_hosts:
397-
- host: controller1
398-
ip: <host IP on storage net>
399-
port: 8100
400-
- host: controller2
401-
ip: <host IP on storage net>
402-
port: 8100
403-
- host: controller3
404-
ip: <host IP on storage net>
405-
port: 8100
397+
- host: controller1
398+
ip: <host IP on storage net>
399+
port: 8100
400+
- host: controller2
401+
ip: <host IP on storage net>
402+
port: 8100
403+
- host: controller3
404+
ip: <host IP on storage net>
405+
port: 8100
406406
407407
HA with Ingress services
408408
~~~~~~~~~~~~~~~~~~~~~~~~
@@ -415,12 +415,12 @@ pair).
415415
.. code:: yaml
416416
417417
cephadm_ingress_services:
418-
- id: rgw.myrgw
419-
spec:
420-
frontend_port: 443
421-
monitor_port: 1967
422-
virtual_ip: 10.66.0.1/24
423-
ssl_cert: {example_certificate_chain}
418+
- id: rgw.myrgw
419+
spec:
420+
frontend_port: 443
421+
monitor_port: 1967
422+
virtual_ip: 10.66.0.1/24
423+
ssl_cert: {example_certificate_chain}
424424
425425
When using ingress services, you will need to stop Kolla from configuring your
426426
RGWs to use the Kolla-deployed haproxy. Set the following in Kolla

0 commit comments

Comments
 (0)