Skip to content

Commit 6a6ba1f

Browse files
authored
Merge branch 'stackhpc/2024.1' into update-dependency/kolla/stackhpc/2024.1
2 parents 85049b1 + 6e1b662 commit 6a6ba1f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

doc/source/configuration/cephadm.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ The set of commands below configure all of these.
390390
- "config set client.rgw rgw_keystone_admin_user 'ceph_rgw'"
391391
- "config set client.rgw rgw_keystone_api_version '3'"
392392
- "config set client.rgw rgw_keystone_token_cache_size '10000'"
393-
- "config set client.rgw rgw_keystone_url https://{{ kolla_internal_fqdn }}:5000"
393+
- "config set client.rgw rgw_keystone_url {{ 'https' if kolla_enable_tls_internal | bool else 'http' }}://{{ kolla_internal_fqdn }}:5000"
394394
- "config set client.rgw rgw_keystone_verify_ssl false"
395395
- "config set client.rgw rgw_max_attr_name_len '1000'"
396396
- "config set client.rgw rgw_max_attr_size '1000'"

etc/kayobe/stackhpc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ stackhpc_kolla_source_version: stackhpc/18.6.0.8
169169

170170
# Kolla Ansible source repository.
171171
stackhpc_kolla_ansible_source_url: "https://github.com/stackhpc/kolla-ansible"
172-
stackhpc_kolla_ansible_source_version: stackhpc/18.6.0.7
172+
stackhpc_kolla_ansible_source_version: stackhpc/18.6.0.8
173173

174174
###############################################################################
175175
# Container image registry

0 commit comments

Comments
 (0)