From 0aaed817b8702bae9106abda6fc8c31043521767 Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Tue, 19 Sep 2023 16:34:57 +0100 Subject: [PATCH] Fix indentation & use internal fqdn --- doc/source/configuration/cephadm.rst | 40 ++++++++++++++-------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/doc/source/configuration/cephadm.rst b/doc/source/configuration/cephadm.rst index 504efb313..484c1882c 100644 --- a/doc/source/configuration/cephadm.rst +++ b/doc/source/configuration/cephadm.rst @@ -316,10 +316,10 @@ RGWs are defined with the following: .. code:: yaml cephadm_radosgw_services: - - id: myrgw - count_per_host: 1 - spec: - rgw_frontend_port: 80 + - id: myrgw + count_per_host: 1 + spec: + rgw_frontend_port: 80 Ceph RGWs require additional configuration to: @@ -345,7 +345,7 @@ The set of commands below configure all of these. - "config set client.rgw rgw_keystone_admin_user 'ceph_rgw'" - "config set client.rgw rgw_keystone_api_version '3'" - "config set client.rgw rgw_keystone_token_cache_size '10000'" - - "config set client.rgw rgw_keystone_url https://{{ internal_net_vip_address }}:5000" + - "config set client.rgw rgw_keystone_url https://{{ kolla_internal_fqdn }}:5000" - "config set client.rgw rgw_keystone_verify_ssl false" - "config set client.rgw rgw_max_attr_name_len '1000'" - "config set client.rgw rgw_max_attr_size '1000'" @@ -394,15 +394,15 @@ add definitions of your Ceph hosts to Kolla ``globals.yml``: .. code:: yaml ceph_rgw_hosts: - - host: controller1 - ip: - port: 8100 - - host: controller2 - ip: - port: 8100 - - host: controller3 - ip: - port: 8100 + - host: controller1 + ip: + port: 8100 + - host: controller2 + ip: + port: 8100 + - host: controller3 + ip: + port: 8100 HA with Ingress services ~~~~~~~~~~~~~~~~~~~~~~~~ @@ -415,12 +415,12 @@ pair). .. code:: yaml cephadm_ingress_services: - - id: rgw.myrgw - spec: - frontend_port: 443 - monitor_port: 1967 - virtual_ip: 10.66.0.1/24 - ssl_cert: {example_certificate_chain} + - id: rgw.myrgw + spec: + frontend_port: 443 + monitor_port: 1967 + virtual_ip: 10.66.0.1/24 + ssl_cert: {example_certificate_chain} When using ingress services, you will need to stop Kolla from configuring your RGWs to use the Kolla-deployed haproxy. Set the following in Kolla