starlingx/openstack-armada-app
Code Issues Proposed changes

Update openstack-helm commit

Browse Source 
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 at
01f6571912

Patch 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 commit
af4e2aaadd

Patch 0007-Allow-more-generic-overrides-for-placeme.patch
Changes that this patch applies were already applied on commit
bdbea96326

Patch 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 commit
20b6b9a236

Due to changes implemented on 054affa290 (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 on 04d600c5b0

Story: 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
This commit is contained in:
Arthur Luz de Avila 2021-09-16 17:23:10 -03:00 committed by Arthur Luz de Ávila
parent 9a86882cda
commit aedbb8aa0c
20 changed files with 225 additions and 1941 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
centos_tarball-dl.lst
View File

@ -1,2 +1,2 @@
openstack-helm-34a7533b6484a157c8725889d0d68e792e13fc8d.tar.gz#openstack-helm#https://github.com/openstack/openstack-helm/archive/34a7533b6484a157c8725889d0d68e792e13fc8d.tar.gz#http## openstack-helm-7803000a545687ec40b0ddc41d46a6b377dea45f.tar.gz#openstack-helm#https://github.com/openstack/openstack-helm/archive/7803000a545687ec40b0ddc41d46a6b377dea45f.tar.gz#http##
openstack-helm-infra-8351fdd0f1228717342c2accc96977b0cdc36dc3.tar.gz#openstack-helm-infra#https://github.com/openstack/openstack-helm-infra/archive/8351fdd0f1228717342c2accc96977b0cdc36dc3.tar.gz#http## openstack-helm-infra-8351fdd0f1228717342c2accc96977b0cdc36dc3.tar.gz#openstack-helm-infra#https://github.com/openstack/openstack-helm-infra/archive/8351fdd0f1228717342c2accc96977b0cdc36dc3.tar.gz#http##

2
openstack-helm/centos/build_srpm.data
View File

@ -1,5 +1,5 @@
TAR_NAME=openstack-helm TAR_NAME=openstack-helm
SHA=34a7533b6484a157c8725889d0d68e792e13fc8d SHA=7803000a545687ec40b0ddc41d46a6b377dea45f
VERSION=1.0.0 VERSION=1.0.0
TAR="$TAR_NAME-$SHA.tar.gz" TAR="$TAR_NAME-$SHA.tar.gz"

19
openstack-helm/centos/openstack-helm.spec
View File

@ -1,4 +1,4 @@
%global sha 34a7533b6484a157c8725889d0d68e792e13fc8d %global sha 7803000a545687ec40b0ddc41d46a6b377dea45f
%global helm_folder /usr/lib/helm %global helm_folder /usr/lib/helm
%global toolkit_version 0.2.19 %global toolkit_version 0.2.19
%global helmchart_version 0.1.0 %global helmchart_version 0.1.0
@ -23,14 +23,11 @@ Patch01: 0001-Ceilometer-chart-add-the-ability-to-publish-events-t.patch
Patch02: 0002-Remove-stale-Apache2-service-pids-when-a-POD-starts.patch Patch02: 0002-Remove-stale-Apache2-service-pids-when-a-POD-starts.patch
Patch03: 0003-Nova-console-ip-address-search-optionality.patch Patch03: 0003-Nova-console-ip-address-search-optionality.patch
Patch04: 0004-Nova-chart-Support-ephemeral-pool-creation.patch Patch04: 0004-Nova-chart-Support-ephemeral-pool-creation.patch
Patch05: 0005-Nova-Add-support-for-disabling-Readiness-Liveness-pr.patch Patch05: 0005-Support-ingress-creation-for-keystone-admin-endpoint.patch
Patch06: 0006-Support-ingress-creation-for-keystone-admin-endpoint.patch Patch06: 0006-Allow-set-public-endpoint-url-for-keystone-endpoints.patch
Patch07: 0007-Allow-more-generic-overrides-for-placeme.patch Patch07: 0007-Wrong-usage-of-rbd_store_chunk_size.patch
Patch08: 0008-Allow-set-public-endpoint-url-for-keystone-endpoints.patch Patch08: 0008-Add-stx_admin-account.patch
Patch09: 0009-Wrong-usage-of-rbd_store_chunk_size.patch Patch09: 0009-Disabling-helm3_hook.patch
Patch10: 0010-Add-stx_admin-account.patch
Patch11: 0011-Trust-public-ingress-certificate.patch
Patch12: 0012-Update-helm-tookit-dependencies-to-0.2.19.patch
BuildRequires: helm BuildRequires: helm
BuildRequires: openstack-helm-infra BuildRequires: openstack-helm-infra
@ -51,9 +48,6 @@ Openstack Helm charts
%patch07 -p1 %patch07 -p1
%patch08 -p1 %patch08 -p1
%patch09 -p1 %patch09 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
%build %build
# Stage helm-toolkit in the local repo # Stage helm-toolkit in the local repo
@ -95,4 +89,3 @@ install -p -D -m 755 *.tgz ${RPM_BUILD_ROOT}%{helm_folder}
#helm_folder is owned by openstack-helm-infra #helm_folder is owned by openstack-helm-infra
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{helm_folder}/* %{helm_folder}/*

10
openstack-helm/files/0003-Nova-console-ip-address-search-optionality.patch
View File

@ -45,15 +45,15 @@ diff --git a/nova/values.yaml b/nova/values.yaml
index 6fb6237..ca92907 100644 index 6fb6237..ca92907 100644
--- a/nova/values.yaml --- a/nova/values.yaml
+++ b/nova/values.yaml +++ b/nova/values.yaml
@@ -512,6 +512,7 @@ console: @@ -527,6 +527,7 @@ console:
vncproxy: vncproxy:
# IF blank, search default routing interface # IF blank, search default routing interface
vncserver_proxyclient_interface: vncserver_proxyclient_interface:
+ address_search_enabled: true + address_search_enabled: true
ssh: ceph_client:
key_types: configmap: ceph-etc
@@ -1658,6 +1659,7 @@ conf: @@ -1666,6 +1666,7 @@ conf:
# If this option is set to None, the hostname of the migration target compute node will be used. # If this option is set to None, the hostname of the migration target compute node will be used.
live_migration_interface: live_migration_interface:
hypervisor: hypervisor:

28
openstack-helm/files/0004-Nova-chart-Support-ephemeral-pool-creation.patch
View File

@ -105,15 +105,15 @@ diff --git a/nova/templates/configmap-bin.yaml b/nova/templates/configmap-bin.ya
index c4e47fb..54571ac 100644 index c4e47fb..54571ac 100644
--- a/nova/templates/configmap-bin.yaml --- a/nova/templates/configmap-bin.yaml
+++ b/nova/templates/configmap-bin.yaml +++ b/nova/templates/configmap-bin.yaml
@@ -85,6 +85,8 @@ data: @@ -93,6 +93,8 @@ data:
{{ tuple "bin/_nova-console-proxy-init.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{ tuple "bin/_nova-console-proxy-init.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
nova-console-proxy-init-assets.sh: | nova-console-proxy-init-assets.sh: |
{{ tuple "bin/_nova-console-proxy-init-assets.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{ tuple "bin/_nova-console-proxy-init-assets.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
+ nova-storage-init.sh: | + nova-storage-init.sh: |
+{{ tuple "bin/_nova-storage-init.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} +{{ tuple "bin/_nova-storage-init.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
ssh-init.sh: |
{{ tuple "bin/_ssh-init.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
ssh-start.sh: | ssh-start.sh: |
{{ tuple "bin/_ssh-start.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
cell-setup.sh: |
diff --git a/nova/templates/job-storage-init.yaml b/nova/templates/job-storage-init.yaml diff --git a/nova/templates/job-storage-init.yaml b/nova/templates/job-storage-init.yaml
new file mode 100644 new file mode 100644
index 0000000..3963926 index 0000000..3963926
@ -277,15 +277,15 @@ diff --git a/nova/values.yaml b/nova/values.yaml
index ca92907..3179231 100644 index ca92907..3179231 100644
--- a/nova/values.yaml --- a/nova/values.yaml
+++ b/nova/values.yaml +++ b/nova/values.yaml
@@ -85,6 +85,7 @@ images: @@ -87,6 +87,7 @@ images:
nova_service_cleaner: 'docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial' nova_service_cleaner: 'docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial'
nova_spiceproxy: docker.io/openstackhelm/nova:stein-ubuntu_bionic nova_spiceproxy: docker.io/openstackhelm/nova:stein-ubuntu_bionic
nova_spiceproxy_assets: docker.io/openstackhelm/nova:stein-ubuntu_bionic nova_spiceproxy_assets: docker.io/openstackhelm/nova:stein-ubuntu_bionic
+ nova_storage_init: 'docker.io/port/ceph-config-helper:v1.10.3' + nova_storage_init: 'docker.io/port/ceph-config-helper:v1.10.3'
test: docker.io/xrally/xrally-openstack:1.3.0 test: docker.io/xrally/xrally-openstack:2.0.0
image_repo_sync: docker.io/docker:17.07.0 image_repo_sync: docker.io/docker:17.07.0
nova_wait_for_computes_init: gcr.io/google_containers/hyperkube-amd64:v1.11.6 nova_wait_for_computes_init: gcr.io/google_containers/hyperkube-amd64:v1.11.6
@@ -608,6 +609,14 @@ conf: @@ -616,6 +617,14 @@ conf:
user: "cinder" user: "cinder"
keyring: null keyring: null
secret_uuid: 457eb676-33da-42ec-9a8c-9293d545c337 secret_uuid: 457eb676-33da-42ec-9a8c-9293d545c337
@ -297,15 +297,15 @@ index ca92907..3179231 100644
+ rbd_crush_rule: 0 + rbd_crush_rule: 0
+ rbd_replication: 3 + rbd_replication: 3
+ rbd_chunk_size: 64 + rbd_chunk_size: 64
ssh: | rally_tests:
Host * run_tempest: false
StrictHostKeyChecking no clean_up: |
@@ -1865,6 +1874,7 @@ secrets: @@ -1893,6 +1902,7 @@ secrets:
placement: compute_spice_proxy:
placement: spiceproxy:
public: placement-tls-public internal: nova-tls-spiceproxy
+ ephemeral: nova-ephemeral + ephemeral: nova-ephemeral
# typically overridden by environmental # typically overridden by environmental
# values, but should include all endpoints # values, but should include all endpoints
@@ -2572,6 +2582,13 @@ pod: @@ -2572,6 +2582,13 @@ pod:

226
openstack-helm/files/0005-Nova-Add-support-for-disabling-Readiness-Liveness-pr.patch
View File

@ -1,226 +0,0 @@
From 6126b916d6fc135d07203651434e37a3bd54454b Mon Sep 17 00:00:00 2001
From: Robert Church <robert.church@windriver.com>
Date: Fri, 22 Mar 2019 03:42:08 -0400
Subject: [PATCH] Nova: Add support for disabling Readiness/Liveness probes
With the introduction of Readiness/Liveness probes in
Ib8e4b93486588320fd2d562c3bc90b65844e52e5, some probes are failing and
preventing successful armada manifest applies.
Add support to disable the probes.
Change-Id: Iebe7327055f58fa78ce3fcac968c1fa617c30c2f
Signed-off-by: Robert Church <robert.church@windriver.com>
---
nova/templates/daemonset-compute.yaml | 4 ++++
nova/templates/deployment-conductor.yaml | 4 ++++
nova/templates/deployment-consoleauth.yaml | 4 ++++
nova/templates/deployment-novncproxy.yaml | 4 ++++
nova/templates/deployment-scheduler.yaml | 4 ++++
nova/templates/deployment-spiceproxy.yaml | 4 ++++
nova/values.yaml | 27 +++++++++++++++++++++++++++
7 files changed, 51 insertions(+)
diff --git a/nova/templates/daemonset-compute.yaml b/nova/templates/daemonset-compute.yaml
index c623f52..3d0908f 100644
--- a/nova/templates/daemonset-compute.yaml
+++ b/nova/templates/daemonset-compute.yaml
@@ -194,6 +194,7 @@ spec:
- name: LIBVIRT_CEPH_SECRET_UUID
value: "{{ .Values.conf.ceph.secret_uuid }}"
{{ end }}
+ {{- if .Values.pod.probes.readiness.nova_compute.enabled }}
readinessProbe:
exec:
command:
@@ -209,6 +210,8 @@ spec:
initialDelaySeconds: 80
periodSeconds: 190
timeoutSeconds: 185
+ {{- end }}
+ {{- if .Values.pod.probes.liveness.nova_compute.enabled }}
livenessProbe:
exec:
command:
@@ -225,6 +228,7 @@ spec:
initialDelaySeconds: 120
periodSeconds: 600
timeoutSeconds: 580
+ {{- end }}
command:
- /tmp/nova-compute.sh
terminationMessagePath: /var/log/termination-log
diff --git a/nova/templates/deployment-conductor.yaml b/nova/templates/deployment-conductor.yaml
index 7fe578a..a4d3852 100644
--- a/nova/templates/deployment-conductor.yaml
+++ b/nova/templates/deployment-conductor.yaml
@@ -58,6 +58,7 @@ spec:
{{ tuple $envAll "nova_conductor" | include "helm-toolkit.snippets.image" | indent 10 }}
{{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
{{ dict "envAll" $envAll "application" "nova" "container" "nova_conductor" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
+ {{- if .Values.pod.probes.readiness.nova_conductor.enabled }}
readinessProbe:
exec:
command:
@@ -70,6 +71,8 @@ spec:
initialDelaySeconds: 80
periodSeconds: 190
timeoutSeconds: 185
+ {{- end }}
+ {{- if .Values.pod.probes.liveness.nova_conductor.enabled }}
livenessProbe:
exec:
command:
@@ -83,6 +86,7 @@ spec:
initialDelaySeconds: 120
periodSeconds: 600
timeoutSeconds: 580
+ {{- end }}
command:
- /tmp/nova-conductor.sh
volumeMounts:
diff --git a/nova/templates/deployment-consoleauth.yaml b/nova/templates/deployment-consoleauth.yaml
index 575896c..a9a58b2 100644
--- a/nova/templates/deployment-consoleauth.yaml
+++ b/nova/templates/deployment-consoleauth.yaml
@@ -58,6 +58,7 @@ spec:
{{ tuple $envAll "nova_consoleauth" | include "helm-toolkit.snippets.image" | indent 10 }}
{{ tuple $envAll $envAll.Values.pod.resources.consoleauth | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
{{ dict "envAll" $envAll "application" "nova" "container" "nova_consoleauth" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
+ {{- if .Values.pod.probes.readiness.nova_consoleauth.enabled }}
readinessProbe:
exec:
command:
@@ -70,6 +71,8 @@ spec:
initialDelaySeconds: 80
periodSeconds: 190
timeoutSeconds: 185
+ {{- end }}
+ {{- if .Values.pod.probes.liveness.nova_consoleauth.enabled }}
livenessProbe:
exec:
command:
@@ -83,6 +86,7 @@ spec:
initialDelaySeconds: 120
periodSeconds: 600
timeoutSeconds: 580
+ {{- end }}
command:
- /tmp/nova-consoleauth.sh
volumeMounts:
diff --git a/nova/templates/deployment-novncproxy.yaml b/nova/templates/deployment-novncproxy.yaml
index 1291523..723ee88 100644
--- a/nova/templates/deployment-novncproxy.yaml
+++ b/nova/templates/deployment-novncproxy.yaml
@@ -102,14 +102,18 @@ spec:
{{ tuple $envAll "nova_novncproxy" | include "helm-toolkit.snippets.image" | indent 10 }}
{{ tuple $envAll $envAll.Values.pod.resources.novncproxy | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
{{ dict "envAll" $envAll "application" "nova" "container" "nova_novncproxy" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
+ {{- if .Values.pod.probes.readiness.nova_novcnproxy.enabled }}
readinessProbe:
tcpSocket:
port: {{ tuple "compute_novnc_proxy" "internal" "novnc_proxy" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
initialDelaySeconds: 30
+ {{- end }}
+ {{- if .Values.pod.probes.liveness.nova_novcnproxy.enabled }}
livenessProbe:
tcpSocket:
port: {{ tuple "compute_novnc_proxy" "internal" "novnc_proxy" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
initialDelaySeconds: 30
+ {{- end }}
command:
- /tmp/nova-console-proxy.sh
ports:
diff --git a/nova/templates/deployment-scheduler.yaml b/nova/templates/deployment-scheduler.yaml
index d49682c..cdee77f 100644
--- a/nova/templates/deployment-scheduler.yaml
+++ b/nova/templates/deployment-scheduler.yaml
@@ -58,6 +58,7 @@ spec:
{{ tuple $envAll "nova_scheduler" | include "helm-toolkit.snippets.image" | indent 10 }}
{{ tuple $envAll $envAll.Values.pod.resources.scheduler | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
{{ dict "envAll" $envAll "application" "nova" "container" "nova_scheduler" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
+ {{- if .Values.pod.probes.readiness.nova_scheduler.enabled }}
readinessProbe:
exec:
command:
@@ -70,6 +71,8 @@ spec:
initialDelaySeconds: 80
periodSeconds: 190
timeoutSeconds: 185
+ {{- end }}
+ {{- if .Values.pod.probes.liveness.nova_scheduler.enabled }}
livenessProbe:
exec:
command:
@@ -83,6 +86,7 @@ spec:
initialDelaySeconds: 120
periodSeconds: 600
timeoutSeconds: 580
+ {{- end }}
command:
- /tmp/nova-scheduler.sh
volumeMounts:
diff --git a/nova/templates/deployment-spiceproxy.yaml b/nova/templates/deployment-spiceproxy.yaml
index 7278829..13e273e 100644
--- a/nova/templates/deployment-spiceproxy.yaml
+++ b/nova/templates/deployment-spiceproxy.yaml
@@ -99,14 +99,18 @@ spec:
{{ tuple $envAll "nova_spiceproxy" | include "helm-toolkit.snippets.image" | indent 10 }}
{{ tuple $envAll $envAll.Values.pod.resources.spiceproxy | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
{{ dict "envAll" $envAll "application" "nova" "container" "nova_spiceproxy" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
+ {{- if .Values.pod.probes.readiness.nova_spiceproxy.enabled }}
readinessProbe:
tcpSocket:
port: {{ tuple "compute_spice_proxy" "internal" "spice_proxy" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
initialDelaySeconds: 30
+ {{- end }}
+ {{- if .Values.pod.probes.liveness.nova_spiceproxy.enabled }}
livenessProbe:
tcpSocket:
port: {{ tuple "compute_spice_proxy" "internal" "spice_proxy" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
initialDelaySeconds: 30
+ {{- end }}
command:
- /tmp/nova-console-proxy.sh
ports:
diff --git a/nova/values.yaml b/nova/values.yaml
index 3179231..c445d15 100644
--- a/nova/values.yaml
+++ b/nova/values.yaml
@@ -2589,6 +2589,33 @@ pod:
limits:
memory: "1024Mi"
cpu: "2000m"
+ probes:
+ readiness:
+ nova_compute:
+ enabled: true
+ nova_conductor:
+ enabled: true
+ nova_consoleauth:
+ enabled: true
+ nova_novcnproxy:
+ enabled: true
+ nova_scheduler:
+ enabled: true
+ nova_spiceproxy:
+ enabled: true
+ liveness:
+ nova_compute:
+ enabled: true
+ nova_conductor:
+ enabled: true
+ nova_consoleauth:
+ enabled: true
+ nova_novcnproxy:
+ enabled: true
+ nova_scheduler:
+ enabled: true
+ nova_spiceproxy:
+ enabled: true
network_policy:
nova:
--
1.8.3.1

6
openstack-helm/files/0006-Support-ingress-creation-for-keystone-admin-endpoint.patch → openstack-helm/files/0005-Support-ingress-creation-for-keystone-admin-endpoint.patch
View File

@ -18,11 +18,10 @@ diff --git a/keystone/templates/ingress-api.yaml b/keystone/templates/ingress-ap
index de36571..37c3013 100644 index de36571..37c3013 100644
--- a/keystone/templates/ingress-api.yaml --- a/keystone/templates/ingress-api.yaml
+++ b/keystone/templates/ingress-api.yaml +++ b/keystone/templates/ingress-api.yaml
@@ -18,3 +18,12 @@ limitations under the License. @@ -21,3 +21,11 @@ limitations under the License.
{{- $ingressOpts := dict "envAll" . "backendServiceType" "identity" "backendPort" "ks-pub" -}} {{- end -}}
{{ $ingressOpts | include "helm-toolkit.manifests.ingress" }} {{ $ingressOpts | include "helm-toolkit.manifests.ingress" }}
{{- end }} {{- end }}
+
+{{- if and .Values.manifests.ingress_api .Values.network.api.ingress.admin }} +{{- if and .Values.manifests.ingress_api .Values.network.api.ingress.admin }}
+{{ $ingressNamePublic := tuple "identity" "public" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }} +{{ $ingressNamePublic := tuple "identity" "public" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
+{{ $ingressNameAdmin := tuple "identity" "admin" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }} +{{ $ingressNameAdmin := tuple "identity" "admin" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
@ -33,4 +32,3 @@ index de36571..37c3013 100644
+{{- end }} +{{- end }}
-- --
1.8.3.1 1.8.3.1

0
openstack-helm/files/0008-Allow-set-public-endpoint-url-for-keystone-endpoints.patch → openstack-helm/files/0006-Allow-set-public-endpoint-url-for-keystone-endpoints.patch
View File

78
openstack-helm/files/0007-Allow-more-generic-overrides-for-placeme.patch
View File

@ -1,78 +0,0 @@
From 17e0d2616389aabd4f07c561698fa4870b121bd4 Mon Sep 17 00:00:00 2001
From: Zhipeng Liu <zhipengs.liu@intel.com>
Date: Thu, 14 May 2020 06:20:38 +0000
Subject: [PATCH] Allow more generic overrides for placement.patch
Signed-off-by: Zhipeng Liu <zhipengs.liu@intel.com>
---
placement/templates/bin/_placement-api.sh.tpl | 21 +++++++++++++++++----
placement/values.yaml | 12 ++++++++++++
2 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/placement/templates/bin/_placement-api.sh.tpl b/placement/templates/bin/_placement-api.sh.tpl
index 5cd8918..7c5acb3 100644
--- a/placement/templates/bin/_placement-api.sh.tpl
+++ b/placement/templates/bin/_placement-api.sh.tpl
@@ -24,19 +24,32 @@ function start () {
cp -a $(type -p placement-api) /var/www/cgi-bin/placement/
if [ -f /etc/apache2/envvars ]; then
- # Loading Apache2 ENV variables
- source /etc/apache2/envvars
+ # Loading Apache2 ENV variables
+ source /etc/apache2/envvars
+ # The directory below has to be created due to the fact that
+ # libapache2-mod-wsgi-py3 doesn't create it in contrary by libapache2-mod-wsgi
+ mkdir -p ${APACHE_RUN_DIR}
fi
# Get rid of stale pid file if present.
rm -f /var/run/apache2/*.pid
# Start Apache2
- exec apache2ctl -DFOREGROUND
+ {{- if .Values.conf.software.apache2.a2enmod }}
+ {{- range .Values.conf.software.apache2.a2enmod }}
+ a2enmod {{ . }}
+ {{- end }}
+ {{- end }}
+ {{- if .Values.conf.software.apache2.a2dismod }}
+ {{- range .Values.conf.software.apache2.a2dismod }}
+ a2dismod {{ . }}
+ {{- end }}
+ {{- end }}
+ exec {{ .Values.conf.software.apache2.binary }} {{ .Values.conf.software.apache2.start_parameters }}
}
function stop () {
- apache2ctl -k graceful-stop
+ {{ .Values.conf.software.apache2.binary }} -k graceful-stop
}
$COMMAND
diff --git a/placement/values.yaml b/placement/values.yaml
index 9cff0dc..f16fd5d 100644
--- a/placement/values.yaml
+++ b/placement/values.yaml
@@ -65,6 +65,18 @@ conf:
segregation: 'rule:context_is_admin'
admin_or_owner: 'rule:context_is_admin or project_id:%(project_id)s'
default: 'rule:admin_or_owner'
+ software:
+ apache2:
+ binary: apache2
+ start_parameters: -DFOREGROUND
+ # Enable/Disable modules
+ # a2enmod:
+ # - headers
+ # - rewrite
+ # a2dismod:
+ # - status
+ a2enmod: null
+ a2dismod: null
placement:
DEFAULT:
debug: false
--
1.8.3.1

0
openstack-helm/files/0009-Wrong-usage-of-rbd_store_chunk_size.patch → openstack-helm/files/0007-Wrong-usage-of-rbd_store_chunk_size.patch
View File

34
openstack-helm/files/0010-Add-stx_admin-account.patch → openstack-helm/files/0008-Add-stx_admin-account.patch
View File

@ -4,20 +4,24 @@ Date: Wed, 28 Oct 2020 15:17:34 +0800
Subject: [PATCH] Add stx_admin account for host to communicate with openstack Subject: [PATCH] Add stx_admin account for host to communicate with openstack
app app
lcavalca: changed content to support tls keystone
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com> Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
Signed-off-by: Lucas Cavalcante <lucasmedeiros.cavalcante@windriver.com>
Change-Id: Iedcd131578f4e33efd3c3d7c47cbef83331b143a
--- ---
keystone/templates/job-ks-user.yaml | 18 ++++++++++++++++++ keystone/templates/job-ks-user.yaml | 21 +++++++++++++++++++++
keystone/templates/secret-keystone.yaml | 2 +- keystone/templates/secret-keystone.yaml | 2 +-
keystone/values.yaml | 17 +++++++++++++++++ keystone/values.yaml | 17 +++++++++++++++++
3 files changed, 36 insertions(+), 1 deletion(-) 3 files changed, 39 insertions(+), 1 deletion(-)
create mode 100644 keystone/templates/job-ks-user.yaml create mode 100644 keystone/templates/job-ks-user.yaml
diff --git a/keystone/templates/job-ks-user.yaml b/keystone/templates/job-ks-user.yaml diff --git a/keystone/templates/job-ks-user.yaml b/keystone/templates/job-ks-user.yaml
new file mode 100644 new file mode 100644
index 0000000..aec4641 index 00000000..91f990f3
--- /dev/null --- /dev/null
+++ b/keystone/templates/job-ks-user.yaml +++ b/keystone/templates/job-ks-user.yaml
@@ -0,0 +1,18 @@ @@ -0,0 +1,21 @@
+{{/* +{{/*
+Licensed under the Apache License, Version 2.0 (the "License"); +Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License. +you may not use this file except in compliance with the License.
@ -34,10 +38,13 @@ index 0000000..aec4641
+ +
+{{- if .Values.manifests.job_ks_user }} +{{- if .Values.manifests.job_ks_user }}
+{{- $ksUserJob := dict "envAll" . "serviceName" "keystone" "serviceUser" "stx_admin" -}} +{{- $ksUserJob := dict "envAll" . "serviceName" "keystone" "serviceUser" "stx_admin" -}}
+{{- if .Values.manifests.certificates -}}
+{{- $_ := set $ksUserJob "tlsSecret" .Values.secrets.tls.identity.api.internal -}}
+{{- end -}}
+{{ $ksUserJob | include "helm-toolkit.manifests.job_ks_user" }} +{{ $ksUserJob | include "helm-toolkit.manifests.job_ks_user" }}
+{{- end }} +{{- end }}
diff --git a/keystone/templates/secret-keystone.yaml b/keystone/templates/secret-keystone.yaml diff --git a/keystone/templates/secret-keystone.yaml b/keystone/templates/secret-keystone.yaml
index 5aa87ab..0e471f1 100644 index 5aa87ab5..0e471f13 100644
--- a/keystone/templates/secret-keystone.yaml --- a/keystone/templates/secret-keystone.yaml
+++ b/keystone/templates/secret-keystone.yaml +++ b/keystone/templates/secret-keystone.yaml
@@ -14,7 +14,7 @@ limitations under the License. @@ -14,7 +14,7 @@ limitations under the License.
@ -50,10 +57,10 @@ index 5aa87ab..0e471f1 100644
--- ---
apiVersion: v1 apiVersion: v1
diff --git a/keystone/values.yaml b/keystone/values.yaml diff --git a/keystone/values.yaml b/keystone/values.yaml
index 473379d..68bbcdd 100644 index 5f0e7aa1..ff4493f3 100644
--- a/keystone/values.yaml --- a/keystone/values.yaml
+++ b/keystone/values.yaml +++ b/keystone/values.yaml
@@ -146,6 +146,10 @@ dependencies: @@ -141,6 +141,10 @@ dependencies:
services: services:
- endpoint: internal - endpoint: internal
service: oslo_db service: oslo_db
@ -61,10 +68,10 @@ index 473379d..68bbcdd 100644
+ services: + services:
+ - endpoint: internal + - endpoint: internal
+ service: identity + service: identity
rabbit_init: domain_manage:
services: services:
- service: oslo_messaging - endpoint: internal
@@ -1062,6 +1066,7 @@ secrets: @@ -1047,6 +1051,7 @@ secrets:
identity: identity:
admin: keystone-keystone-admin admin: keystone-keystone-admin
test: keystone-keystone-test test: keystone-keystone-test
@ -72,7 +79,7 @@ index 473379d..68bbcdd 100644
oslo_db: oslo_db:
admin: keystone-db-admin admin: keystone-db-admin
keystone: keystone-db-user keystone: keystone-db-user
@@ -1104,6 +1109,17 @@ endpoints: @@ -1090,6 +1095,17 @@ endpoints:
user_domain_name: default user_domain_name: default
project_domain_name: default project_domain_name: default
default_domain_id: default default_domain_id: default
@ -90,7 +97,7 @@ index 473379d..68bbcdd 100644
test: test:
role: admin role: admin
region_name: RegionOne region_name: RegionOne
@@ -1254,6 +1270,7 @@ manifests: @@ -1247,6 +1263,7 @@ manifests:
job_domain_manage: true job_domain_manage: true
job_fernet_setup: true job_fernet_setup: true
job_image_repo_sync: true job_image_repo_sync: true
@ -99,4 +106,5 @@ index 473379d..68bbcdd 100644
pdb_api: true pdb_api: true
pod_rally_test: true pod_rally_test: true
-- --
2.7.4 2.17.1

130
openstack-helm/files/0009-Disabling-helm3_hook.patch Normal file
View File

@ -0,0 +1,130 @@
198597ee329c4c205f8852779e6a49 Mon Sep 17 00:00:00 2001
From: Thiago Brito <thiago.brito@windriver.com>
Date: Mon, 4 Oct 2021 10:04:21 -0300
Subject: [PATCH] Disabling helm3_hook
Since openstack-helm now defaults to use helmv3 hooks, this
changes disables it to maintain compatibility with the helm
version in use on StarlingX.
Signed-off-by: Thiago Brito <thiago.brito@windriver.com>
Change-Id: I2a343805be2bb20f39b2dd8cc8d2e8716961ea28
---
barbican/values.yaml | 2 +-
cinder/values.yaml | 2 +-
glance/values.yaml | 2 +-
heat/values.yaml | 2 +-
keystone/values.yaml | 2 +-
neutron/values.yaml | 2 +-
nova/values.yaml | 2 +-
placement/values.yaml | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/barbican/values.yaml b/barbican/values.yaml
index 72efd88c..44d3b76b 100644
--- a/barbican/values.yaml
+++ b/barbican/values.yaml
@@ -31,7 +31,7 @@ release_group: null
# NOTE(philsphicas): the pre-install hook breaks upgrade for helm2
# Set to false to upgrade using helm2
-helm3_hook: true
+helm3_hook: false
images:
tags:
diff --git a/cinder/values.yaml b/cinder/values.yaml
index a70ed72a..30a2e47a 100644
--- a/cinder/values.yaml
+++ b/cinder/values.yaml
@@ -1516,7 +1516,7 @@ network_policy:
# NOTE(helm_hook): helm_hook might break for helm2 binary.
# set helm3_hook: false when using the helm2 binary.
-helm3_hook: true
+helm3_hook: false
manifests:
certificates: false
diff --git a/glance/values.yaml b/glance/values.yaml
index a03a69a1..459f04bc 100644
--- a/glance/values.yaml
+++ b/glance/values.yaml
@@ -1052,7 +1052,7 @@ pod:
# NOTE(helm_hook): helm_hook might break for helm2 binary.
# set helm3_hook: false when using the helm2 binary.
-helm3_hook: true
+helm3_hook: false
manifests:
certificates: false
diff --git a/heat/values.yaml b/heat/values.yaml
index 58f786b6..9e9ea64b 100644
--- a/heat/values.yaml
+++ b/heat/values.yaml
@@ -1293,7 +1293,7 @@ network_policy:
# NOTE(helm_hook): helm_hook might break for helm2 binary.
# set helm3_hook: false when using the helm2 binary.
-helm3_hook: true
+helm3_hook: false
manifests:
certificates: false
diff --git a/keystone/values.yaml b/keystone/values.yaml
index ff4493f3..84b8fe48 100644
--- a/keystone/values.yaml
+++ b/keystone/values.yaml
@@ -31,7 +31,7 @@ release_group: null
# NOTE(gagehugo): the pre-install hook breaks upgrade for helm2
# Set to false to upgrade using helm2
-helm3_hook: true
+helm3_hook: false
images:
tags:
diff --git a/neutron/values.yaml b/neutron/values.yaml
index c72a55b5..6073c6a3 100644
--- a/neutron/values.yaml
+++ b/neutron/values.yaml
@@ -2514,7 +2514,7 @@ network_policy:
egress:
- {}
-helm3_hook: true
+helm3_hook: false
manifests:
certificates: false
diff --git a/nova/values.yaml b/nova/values.yaml
index 6b51b3d5..56f1dc9a 100644
--- a/nova/values.yaml
+++ b/nova/values.yaml
@@ -2563,7 +2563,7 @@ network_policy:
# NOTE(helm_hook): helm_hook might break for helm2 binary.
# set helm3_hook: false when using the helm2 binary.
-helm3_hook: true
+helm3_hook: false
manifests:
certificates: false
diff --git a/placement/values.yaml b/placement/values.yaml
index 57d9eb48..2811b200 100644
--- a/placement/values.yaml
+++ b/placement/values.yaml
@@ -485,7 +485,7 @@ dependencies:
# NOTE(helm_hook): helm_hook might break for helm2 binary.
# set helm3_hook: false when using the helm2 binary.
-helm3_hook: true
+helm3_hook: false
manifests:
certificates: false
--
2.17.1

1333
openstack-helm/files/0011-Trust-public-ingress-certificate.patch
View File

File diff suppressed because it is too large Load Diff

220
openstack-helm/files/0012-Update-helm-tookit-dependencies-to-0.2.19.patch
View File

@ -1,220 +0,0 @@
From 5eafbeb89313b1bc45369720ba1b700d3cf3c609 Mon Sep 17 00:00:00 2001
From: Thiago Brito <thiago.brito@windriver.com>
Date: Thu, 16 Sep 2021 11:43:02 -0300
Subject: [PATCH] Update helm-tookit dependencies to >=0.1.0
Signed-off-by: Thiago Brito <thiago.brito@windriver.com>
diff --git a/aodh/requirements.yaml b/aodh/requirements.yaml
index 780e525c..fbba94ae 100644
--- a/aodh/requirements.yaml
+++ b/aodh/requirements.yaml
@@ -15,4 +15,4 @@
dependencies:
- name: helm-toolkit
repository: http://localhost:8879/charts
- version: 0.1.0
+ version: ">= 0.1.0"
diff --git a/barbican/requirements.yaml b/barbican/requirements.yaml
index 5669e12c..432e28c1 100644
--- a/barbican/requirements.yaml
+++ b/barbican/requirements.yaml
@@ -13,4 +13,4 @@
dependencies:
- name: helm-toolkit
repository: http://localhost:8879/charts
- version: 0.1.0
+ version: ">= 0.1.0"
diff --git a/ceilometer/requirements.yaml b/ceilometer/requirements.yaml
index 5669e12c..432e28c1 100644
--- a/ceilometer/requirements.yaml
+++ b/ceilometer/requirements.yaml
@@ -13,4 +13,4 @@
dependencies:
- name: helm-toolkit
repository: http://localhost:8879/charts
- version: 0.1.0
+ version: ">= 0.1.0"
diff --git a/cinder/requirements.yaml b/cinder/requirements.yaml
index 5669e12c..432e28c1 100644
--- a/cinder/requirements.yaml
+++ b/cinder/requirements.yaml
@@ -13,4 +13,4 @@
dependencies:
- name: helm-toolkit
repository: http://localhost:8879/charts
- version: 0.1.0
+ version: ">= 0.1.0"
diff --git a/congress/requirements.yaml b/congress/requirements.yaml
index 5669e12c..432e28c1 100644
--- a/congress/requirements.yaml
+++ b/congress/requirements.yaml
@@ -13,4 +13,4 @@
dependencies:
- name: helm-toolkit
repository: http://localhost:8879/charts
- version: 0.1.0
+ version: ">= 0.1.0"
diff --git a/designate/requirements.yaml b/designate/requirements.yaml
index 5669e12c..432e28c1 100644
--- a/designate/requirements.yaml
+++ b/designate/requirements.yaml
@@ -13,4 +13,4 @@
dependencies:
- name: helm-toolkit
repository: http://localhost:8879/charts
- version: 0.1.0
+ version: ">= 0.1.0"
diff --git a/glance/requirements.yaml b/glance/requirements.yaml
index 5669e12c..432e28c1 100644
--- a/glance/requirements.yaml
+++ b/glance/requirements.yaml
@@ -13,4 +13,4 @@
dependencies:
- name: helm-toolkit
repository: http://localhost:8879/charts
- version: 0.1.0
+ version: ">= 0.1.0"
diff --git a/heat/requirements.yaml b/heat/requirements.yaml
index 5669e12c..432e28c1 100644
--- a/heat/requirements.yaml
+++ b/heat/requirements.yaml
@@ -13,4 +13,4 @@
dependencies:
- name: helm-toolkit
repository: http://localhost:8879/charts
- version: 0.1.0
+ version: ">= 0.1.0"
diff --git a/horizon/requirements.yaml b/horizon/requirements.yaml
index 5669e12c..432e28c1 100644
--- a/horizon/requirements.yaml
+++ b/horizon/requirements.yaml
@@ -13,4 +13,4 @@
dependencies:
- name: helm-toolkit
repository: http://localhost:8879/charts
- version: 0.1.0
+ version: ">= 0.1.0"
diff --git a/ironic/requirements.yaml b/ironic/requirements.yaml
index 5669e12c..432e28c1 100644
--- a/ironic/requirements.yaml
+++ b/ironic/requirements.yaml
@@ -13,4 +13,4 @@
dependencies:
- name: helm-toolkit
repository: http://localhost:8879/charts
- version: 0.1.0
+ version: ">= 0.1.0"
diff --git a/keystone/requirements.yaml b/keystone/requirements.yaml
index 5669e12c..432e28c1 100644
--- a/keystone/requirements.yaml
+++ b/keystone/requirements.yaml
@@ -13,4 +13,4 @@
dependencies:
- name: helm-toolkit
repository: http://localhost:8879/charts
- version: 0.1.0
+ version: ">= 0.1.0"
diff --git a/magnum/requirements.yaml b/magnum/requirements.yaml
index 5669e12c..432e28c1 100644
--- a/magnum/requirements.yaml
+++ b/magnum/requirements.yaml
@@ -13,4 +13,4 @@
dependencies:
- name: helm-toolkit
repository: http://localhost:8879/charts
- version: 0.1.0
+ version: ">= 0.1.0"
diff --git a/mistral/requirements.yaml b/mistral/requirements.yaml
index 5669e12c..432e28c1 100644
--- a/mistral/requirements.yaml
+++ b/mistral/requirements.yaml
@@ -13,4 +13,4 @@
dependencies:
- name: helm-toolkit
repository: http://localhost:8879/charts
- version: 0.1.0
+ version: ">= 0.1.0"
diff --git a/neutron/requirements.yaml b/neutron/requirements.yaml
index 5669e12c..432e28c1 100644
--- a/neutron/requirements.yaml
+++ b/neutron/requirements.yaml
@@ -13,4 +13,4 @@
dependencies:
- name: helm-toolkit
repository: http://localhost:8879/charts
- version: 0.1.0
+ version: ">= 0.1.0"
diff --git a/nova/requirements.yaml b/nova/requirements.yaml
index 5669e12c..432e28c1 100644
--- a/nova/requirements.yaml
+++ b/nova/requirements.yaml
@@ -13,4 +13,4 @@
dependencies:
- name: helm-toolkit
repository: http://localhost:8879/charts
- version: 0.1.0
+ version: ">= 0.1.0"
diff --git a/octavia/requirements.yaml b/octavia/requirements.yaml
index 35cf13c6..c09473b3 100644
--- a/octavia/requirements.yaml
+++ b/octavia/requirements.yaml
@@ -15,4 +15,4 @@
dependencies:
- name: helm-toolkit
repository: http://localhost:8879/charts
- version: 0.1.0
+ version: ">= 0.1.0"
diff --git a/panko/requirements.yaml b/panko/requirements.yaml
index 780e525c..fbba94ae 100644
--- a/panko/requirements.yaml
+++ b/panko/requirements.yaml
@@ -15,4 +15,4 @@
dependencies:
- name: helm-toolkit
repository: http://localhost:8879/charts
- version: 0.1.0
+ version: ">= 0.1.0"
diff --git a/placement/requirements.yaml b/placement/requirements.yaml
index 551fd91c..7efb17a3 100644
--- a/placement/requirements.yaml
+++ b/placement/requirements.yaml
@@ -15,4 +15,4 @@
dependencies:
- name: helm-toolkit
repository: http://localhost:8879/charts
- version: 0.1.0
+ version: ">= 0.1.0"
diff --git a/rally/requirements.yaml b/rally/requirements.yaml
index 5669e12c..432e28c1 100644
--- a/rally/requirements.yaml
+++ b/rally/requirements.yaml
@@ -13,4 +13,4 @@
dependencies:
- name: helm-toolkit
repository: http://localhost:8879/charts
- version: 0.1.0
+ version: ">= 0.1.0"
diff --git a/senlin/requirements.yaml b/senlin/requirements.yaml
index 5669e12c..432e28c1 100644
--- a/senlin/requirements.yaml
+++ b/senlin/requirements.yaml
@@ -13,4 +13,4 @@
dependencies:
- name: helm-toolkit
repository: http://localhost:8879/charts
- version: 0.1.0
+ version: ">= 0.1.0"
diff --git a/tempest/requirements.yaml b/tempest/requirements.yaml
index 5669e12c..432e28c1 100644
--- a/tempest/requirements.yaml
+++ b/tempest/requirements.yaml
@@ -13,4 +13,4 @@
dependencies:
- name: helm-toolkit
repository: http://localhost:8879/charts
- version: 0.1.0
+ version: ">= 0.1.0"
--
2.17.1

35
python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/cinder.py
View File

@ -11,11 +11,13 @@ import tsconfig.tsconfig as tsc
from sysinv.common import constants from sysinv.common import constants
from sysinv.common import exception from sysinv.common import exception
from sysinv.common import utils from sysinv.common import utils
from sysinv.common.storage_backend_conf import StorageBackendConfig from sysinv.common import storage_backend_conf
from sysinv.helm import common from sysinv.helm import common
ROOK_CEPH_BACKEND_NAME = 'ceph-store'
class CinderHelm(openstack.OpenstackBaseHelm): class CinderHelm(openstack.OpenstackBaseHelm):
"""Class to encapsulate helm operations for the cinder chart""" """Class to encapsulate helm operations for the cinder chart"""
@ -45,10 +47,12 @@ class CinderHelm(openstack.OpenstackBaseHelm):
cinder_override = self._get_conf_rook_cinder_overrides() cinder_override = self._get_conf_rook_cinder_overrides()
ceph_override = self._get_conf_rook_ceph_overrides() ceph_override = self._get_conf_rook_ceph_overrides()
backend_override = self._get_conf_rook_backends_overrides() backend_override = self._get_conf_rook_backends_overrides()
ceph_client_override = self._get_ceph_client_rook_overrides()
else: else:
cinder_override = self._get_conf_cinder_overrides() cinder_override = self._get_conf_cinder_overrides()
ceph_override = self._get_conf_ceph_overrides() ceph_override = self._get_conf_ceph_overrides()
backend_override = self._get_conf_backends_overrides() backend_override = self._get_conf_backends_overrides()
ceph_client_override = self._get_ceph_client_overrides()
overrides = { overrides = {
common.HELM_NS_OPENSTACK: { common.HELM_NS_OPENSTACK: {
@ -71,7 +75,7 @@ class CinderHelm(openstack.OpenstackBaseHelm):
'backends': backend_override, 'backends': backend_override,
}, },
'endpoints': self._get_endpoints_overrides(), 'endpoints': self._get_endpoints_overrides(),
'ceph_client': self._get_ceph_client_overrides() 'ceph_client': ceph_client_override
} }
} }
@ -91,8 +95,8 @@ class CinderHelm(openstack.OpenstackBaseHelm):
primary_tier_name =\ primary_tier_name =\
constants.SB_TIER_DEFAULT_NAMES[constants.SB_TIER_TYPE_CEPH] constants.SB_TIER_DEFAULT_NAMES[constants.SB_TIER_TYPE_CEPH]
replication, min_replication =\ replication, min_replication = storage_backend_conf\
StorageBackendConfig.get_ceph_pool_replication(self.dbapi) .StorageBackendConfig.get_ceph_pool_replication(self.dbapi)
pools = {} pools = {}
for backend in self.dbapi.storage_ceph_get_list(): for backend in self.dbapi.storage_ceph_get_list():
@ -325,9 +329,9 @@ class CinderHelm(openstack.OpenstackBaseHelm):
'volume_driver': '' 'volume_driver': ''
} }
conf_backends['ceph-store'] = { conf_backends[ROOK_CEPH_BACKEND_NAME] = {
'image_volume_cache_enabled': 'True', 'image_volume_cache_enabled': 'True',
'volume_backend_name': 'ceph-store', 'volume_backend_name': ROOK_CEPH_BACKEND_NAME,
'volume_driver': 'cinder.volume.drivers.rbd.RBDDriver', 'volume_driver': 'cinder.volume.drivers.rbd.RBDDriver',
'rbd_pool': 'cinder-volumes', 'rbd_pool': 'cinder-volumes',
'rbd_user': 'cinder', 'rbd_user': 'cinder',
@ -336,3 +340,20 @@ class CinderHelm(openstack.OpenstackBaseHelm):
constants.SB_TYPE_CEPH_CONF_FILENAME), constants.SB_TYPE_CEPH_CONF_FILENAME),
} }
return conf_backends return conf_backends
def _get_ceph_client_rook_overrides(self):
return {
'user_secret_name': constants.K8S_RBD_PROV_ADMIN_SECRET_NAME,
'internal_ceph_backend': ROOK_CEPH_BACKEND_NAME,
}
def _get_ceph_client_overrides(self):
# A secret is required by the chart for ceph client access. Use the
# secret for the kube-rbd pool associated with the primary ceph tier
ceph_backend_name = constants.SB_DEFAULT_NAMES[constants.SB_TYPE_CEPH]
user_secret_name = storage_backend_conf.K8RbdProvisioner\
.get_user_secret_name({'name': ceph_backend_name})
return {
'user_secret_name': user_secret_name,
'internal_ceph_backend': ceph_backend_name,
}

12
python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/helm/nova.py
View File

@ -169,17 +169,7 @@ class NovaHelm(openstack.OpenstackBaseHelm):
return overrides return overrides
def _get_mount_overrides(self): def _get_mount_overrides(self):
overrides = self._get_mount_uefi_overrides() return self._get_mount_uefi_overrides()
# mount /dev/pts in order to get console log
overrides['volumes'].append({
'name': 'dev-pts',
'hostPath': {'path': '/dev/pts'}
})
overrides['volumeMounts'].append({
'name': 'dev-pts',
'mountPath': '/dev/pts'
})
return overrides
def _get_compute_ironic_manifests(self): def _get_compute_ironic_manifests(self):
ironic_operator = self._operator.chart_operators[ ironic_operator = self._operator.chart_operators[

4
stx-openstack-helm/stx-openstack-helm/helm-charts/nova-api-proxy/templates/deployment.yaml
View File

@ -74,7 +74,7 @@ spec:
mountPath: /etc/proxy/api-proxy-paste.ini mountPath: /etc/proxy/api-proxy-paste.ini
subPath: api-proxy-paste.ini subPath: api-proxy-paste.ini
readOnly: true readOnly: true
{{- dict "enabled" .Values.manifests.certificates "name" .Values.secrets.tls.compute.api_proxy.public | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }} {{- dict "enabled" .Values.manifests.certificates "name" .Values.secrets.tls.compute.api_proxy.internal | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }}
{{ if $mounts_nova_api_proxy.volumeMounts }}{{ toYaml $mounts_nova_api_proxy.volumeMounts | indent 12 }}{{ end }} {{ if $mounts_nova_api_proxy.volumeMounts }}{{ toYaml $mounts_nova_api_proxy.volumeMounts | indent 12 }}{{ end }}
volumes: volumes:
- name: nova-api-proxy-bin - name: nova-api-proxy-bin
@ -85,6 +85,6 @@ spec:
configMap: configMap:
name: nova-api-proxy-etc name: nova-api-proxy-etc
defaultMode: 0777 defaultMode: 0777
{{- dict "enabled" .Values.manifests.certificates "name" .Values.secrets.tls.compute.api_proxy.public | include "helm-toolkit.snippets.tls_volume" | indent 8 }} {{- dict "enabled" .Values.manifests.certificates "name" .Values.secrets.tls.compute.api_proxy.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }}
{{ if $mounts_nova_api_proxy.volumes}}{{ toYaml $mounts_nova_api_proxy.volumes | indent 8 }}{{ end }} {{ if $mounts_nova_api_proxy.volumes}}{{ toYaml $mounts_nova_api_proxy.volumes | indent 8 }}{{ end }}
{{- end }} {{- end }}

2
stx-openstack-helm/stx-openstack-helm/helm-charts/nova-api-proxy/templates/job-ks-endpoints.yaml
View File

@ -9,7 +9,7 @@
{{- if .Values.manifests.job_ks_endpoints }} {{- if .Values.manifests.job_ks_endpoints }}
{{- $ksServiceJob := dict "envAll" . "serviceName" "nova" "serviceTypes" ( tuple "compute" ) -}} {{- $ksServiceJob := dict "envAll" . "serviceName" "nova" "serviceTypes" ( tuple "compute" ) -}}
{{- if .Values.manifests.certificates -}} {{- if .Values.manifests.certificates -}}
{{- $_ := set $ksServiceJob "tlsSecret" .Values.secrets.tls.compute.api_proxy.public -}} {{- $_ := set $ksServiceJob "tlsSecret" .Values.secrets.tls.compute.api_proxy.internal -}}
{{- end -}} {{- end -}}
{{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_endpoints" }} {{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_endpoints" }}
{{- end }} {{- end }}

1
stx-openstack-helm/stx-openstack-helm/helm-charts/nova-api-proxy/values.yaml
View File

@ -292,6 +292,7 @@ secrets:
compute: compute:
api_proxy: api_proxy:
public: nova-tls-public public: nova-tls-public
internal: nova-tls-api
manifests: manifests:
configmap_bin: true configmap_bin: true

24
stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml
View File

@ -485,7 +485,7 @@ data:
curl -X PATCH -H "X-Auth-Token: ${TOKEN}" -H "Content-Type: application/json" -d "${DATA_JSON}" "${REQ_URL}" curl -X PATCH -H "X-Auth-Token: ${TOKEN}" -H "Content-Type: application/json" -d "${DATA_JSON}" "${REQ_URL}"
source: source:
type: tar type: tar
location: http://172.17.0.1/helm_charts/starlingx/keystone-0.1.0.tgz location: http://172.17.0.1/helm_charts/starlingx/keystone-0.2.13.tgz
subpath: keystone subpath: keystone
reference: master reference: master
dependencies: dependencies:
@ -609,7 +609,7 @@ data:
auth_url: http://keystone.openstack.svc.cluster.local:80/v3 auth_url: http://keystone.openstack.svc.cluster.local:80/v3
source: source:
type: tar type: tar
location: http://172.17.0.1/helm_charts/starlingx/barbican-0.1.0.tgz location: http://172.17.0.1/helm_charts/starlingx/barbican-0.2.7.tgz
subpath: barbican subpath: barbican
reference: master reference: master
dependencies: dependencies:
@ -779,7 +779,7 @@ data:
auth_url: http://keystone.openstack.svc.cluster.local:80/v3 auth_url: http://keystone.openstack.svc.cluster.local:80/v3
source: source:
type: tar type: tar
location: http://172.17.0.1/helm_charts/starlingx/glance-0.1.0.tgz location: http://172.17.0.1/helm_charts/starlingx/glance-0.2.9.tgz
subpath: glance subpath: glance
reference: master reference: master
dependencies: dependencies:
@ -876,7 +876,7 @@ data:
storage: rbd storage: rbd
source: source:
type: tar type: tar
location: http://172.17.0.1/helm_charts/starlingx/cinder-0.1.0.tgz location: http://172.17.0.1/helm_charts/starlingx/cinder-0.2.10.tgz
subpath: cinder subpath: cinder
reference: master reference: master
dependencies: dependencies:
@ -1228,7 +1228,7 @@ data:
source: source:
type: tar type: tar
location: http://172.17.0.1/helm_charts/starlingx/nova-0.1.0.tgz location: http://172.17.0.1/helm_charts/starlingx/nova-0.2.21.tgz
subpath: nova subpath: nova
reference: master reference: master
dependencies: dependencies:
@ -1327,7 +1327,7 @@ data:
</Location> </Location>
source: source:
type: tar type: tar
location: http://172.17.0.1/helm_charts/starlingx/placement-0.1.0.tgz location: http://172.17.0.1/helm_charts/starlingx/placement-0.2.4.tgz
subpath: placement subpath: placement
reference: master reference: master
dependencies: dependencies:
@ -1645,7 +1645,7 @@ data:
firewall_driver: openvswitch firewall_driver: openvswitch
source: source:
type: tar type: tar
location: http://172.17.0.1/helm_charts/starlingx/neutron-0.1.0.tgz location: http://172.17.0.1/helm_charts/starlingx/neutron-0.2.9.tgz
subpath: neutron subpath: neutron
reference: master reference: master
dependencies: dependencies:
@ -1765,7 +1765,7 @@ data:
force_public_endpoint: true force_public_endpoint: true
source: source:
type: tar type: tar
location: http://172.17.0.1/helm_charts/starlingx/ironic-0.1.0.tgz location: http://172.17.0.1/helm_charts/starlingx/ironic-0.2.1.tgz
subpath: ironic subpath: ironic
reference: master reference: master
dependencies: dependencies:
@ -1871,7 +1871,7 @@ data:
default: requiredDuringSchedulingIgnoredDuringExecution default: requiredDuringSchedulingIgnoredDuringExecution
source: source:
type: tar type: tar
location: http://172.17.0.1/helm_charts/starlingx/heat-0.1.0.tgz location: http://172.17.0.1/helm_charts/starlingx/heat-0.2.7.tgz
subpath: heat subpath: heat
reference: master reference: master
dependencies: dependencies:
@ -1972,7 +1972,7 @@ data:
</VirtualHost> </VirtualHost>
source: source:
type: tar type: tar
location: http://172.17.0.1/helm_charts/starlingx/aodh-0.1.0.tgz location: http://172.17.0.1/helm_charts/starlingx/aodh-0.2.1.tgz
subpath: aodh subpath: aodh
reference: master reference: master
dependencies: dependencies:
@ -2825,7 +2825,7 @@ data:
default: requiredDuringSchedulingIgnoredDuringExecution default: requiredDuringSchedulingIgnoredDuringExecution
source: source:
type: tar type: tar
location: http://172.17.0.1/helm_charts/starlingx/ceilometer-0.1.0.tgz location: http://172.17.0.1/helm_charts/starlingx/ceilometer-0.2.1.tgz
subpath: ceilometer subpath: ceilometer
reference: master reference: master
dependencies: dependencies:
@ -3765,7 +3765,7 @@ data:
HORIZON_CONFIG["password_autocomplete"] = "off" HORIZON_CONFIG["password_autocomplete"] = "off"
source: source:
type: tar type: tar
location: http://172.17.0.1/helm_charts/starlingx/horizon-0.1.0.tgz location: http://172.17.0.1/helm_charts/starlingx/horizon-0.2.10.tgz
subpath: horizon subpath: horizon
reference: master reference: master
dependencies: dependencies: