aedbb8aa0c
This commit is rebasing on upstream commit 7803000a545687ec40b0ddc41d46a6b377dea45f and also remove some patches that were already merged. This change depends on the rebase of openstack-helm-infra made at01f6571912Patch 0005-Nova-Add-support-for-disabling-Readiness-Liveness-pr.patch This patch was dropped because a feature that add this support was implemented in 2020. It can be found on commitaf4e2aaaddPatch 0007-Allow-more-generic-overrides-for-placeme.patch Changes that this patch applies were already applied on commitbdbea96326Patch 0009-Disabling-helm3_hook.patch Adding a helm3_hook in values.yaml file in case hooks needs to be disabled Patch 0011-Trust-public-ingress-certificate.patch Removed in favor of using the openstack-helm implementation of tls support. As we are dropping this patch we moved the changes to the patch where the job is created. Commits can be found on https://opendev.org/openstack/openstack-helm/commits/branch/master/search?q=feat%28tls%29 Patch 0012-Update-helm-tookit-dependencies-to-0.2.19.patch Changes that this patch applies were already applied on commit20b6b9a236Due to changes implemented on054affa290 (diff-9bd79f0fd832cb30fa4f4b6242b9059fbc0c81b30541b4243ff29cdf39bce621R63)python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/cinder.py needed to be modified so the system overrides for the ceph client matches the name of the internal ceph cluster we that StarlingX creates and the deployment-cinder.yaml renders without issues. We've change the endpoints on nova-api-proxy/templates/deployment.yaml as in upstream openstack-helm deals with TLS internally, however in starlingx there is a workaround that forces public endpoint for openstack services. Although after some changes on openstack-helm that came with this rebase and using cert-manager to generate all tls internal secrets we dont need to do this anymore. The volume mounts for dev-pts at python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nova.py were removed since this problem was fixed upstream on04d600c5b0Story: 2009161 Task: 43150 Change-Id: Iaf7d4bf9aa80e1d5acacdfe24743d41d4e67a8c0 Signed-off-by: Arthur Luz de Avila <arthur.luzdeavila@windriver.com> Signed-off-by: Lucas Cavalcante <lucasmedeiros.cavalcante@windriver.com> Change-Id: Iaf7d4bf9aa80e1d5acacdfe24743d41d4e67a8c0
46 lines
1.7 KiB
Diff
46 lines
1.7 KiB
Diff
From 2892d1bedf30e7260aa67ad93d94677fad55a760 Mon Sep 17 00:00:00 2001
|
|
From: Elena Taivan <elena.taivan@windriver.com>
|
|
Date: Wed, 30 Sep 2020 14:14:32 +0000
|
|
Subject: [PATCH] Wrong usage of 'rbd_store_chunk_size'
|
|
|
|
'rbd_store_chunk_size' option represents the size of the chunks
|
|
of the objects into which an image is chuncked.
|
|
It does not represent the 'pg_num' value of 'images' ceph pool.
|
|
|
|
Solution: replace 'rdb_store_chunk_size' with 'chunk_size' custom
|
|
option.
|
|
---
|
|
glance/templates/job-storage-init.yaml | 2 +-
|
|
glance/values.yaml | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/glance/templates/job-storage-init.yaml b/glance/templates/job-storage-init.yaml
|
|
index 82524086..77ab1c60 100644
|
|
--- a/glance/templates/job-storage-init.yaml
|
|
+++ b/glance/templates/job-storage-init.yaml
|
|
@@ -114,7 +114,7 @@ spec:
|
|
- name: RBD_POOL_CRUSH_RULE
|
|
value: {{ .Values.conf.glance.glance_store.rbd_store_crush_rule | quote }}
|
|
- name: RBD_POOL_CHUNK_SIZE
|
|
- value: {{ .Values.conf.glance.glance_store.rbd_store_chunk_size | quote }}
|
|
+ value: {{ .Values.conf.glance.glance_store.chunk_size | quote }}
|
|
- name: RBD_POOL_SECRET
|
|
value: {{ .Values.secrets.rbd | quote }}
|
|
{{ end }}
|
|
diff --git a/glance/values.yaml b/glance/values.yaml
|
|
index 1428c299..a4f74379 100644
|
|
--- a/glance/values.yaml
|
|
+++ b/glance/values.yaml
|
|
@@ -256,7 +256,7 @@ conf:
|
|
auth_version: v3
|
|
memcache_security_strategy: ENCRYPT
|
|
glance_store:
|
|
- rbd_store_chunk_size: 8
|
|
+ chunk_size: 8
|
|
rbd_store_replication: 3
|
|
rbd_store_crush_rule: replicated_rule
|
|
rbd_store_pool: glance.images
|
|
--
|
|
2.17.1
|
|
|