starlingx
/
openstack-armada-app
Code Issues Proposed changes

Upgrade openstack-helm 

Upgrade openstack-helm to below version.
commit 34a7533b6484a157c8725889d0d68e792e13fc8d
Author: Andreas Jaeger <aj@suse.com>
Date:   Sat Apr 11 15:33:05 2020 +0200
Cleanup py27 support and docs

1) 2 patches removed as they are already merged
0006-Add-Placement-Chart.patch
0008-Check-return-value-of-get-subnets-before-iterate-for.patch
2) 1 patch added
0007-Allow-more-generic-overrides-for-placeme.patch
upstream patch: https://github.com/openstack/openstack-helm/commit/
                bdbea96326828f2655f6a9a4f580e01ef9db7c1a
Story: 2007474
Task:  39418

Depends-on: https://review.opendev.org/#/c/720135/
Change-Id: I4bfb9cd578a8fd6141eb008aa6622855d42a8979
Signed-off-by: Zhipeng Liu <zhipengs.liu@intel.com>
This commit is contained in:
Zhipeng Liu 2020-04-16 01:44:40 +08:00
parent 2bd74e1baf
commit 5b18dcc50e
10 changed files with 177 additions and 1296 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,8 @@
TAR_NAME=openstack-helm
SHA=82c72367c85ca94270f702661c7b984899c1ae38
SHA=34a7533b6484a157c8725889d0d68e792e13fc8d
VERSION=1.0.0
TAR="$TAR_NAME-$SHA.tar.gz"
COPY_LIST="${CGCS_BASE}/downloads/$TAR $PKG_BASE/files/* "
TIS_PATCH_VER=23
TIS_PATCH_VER=24

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

@ -1,4 +1,4 @@
%global sha 82c72367c85ca94270f702661c7b984899c1ae38
%global sha 34a7533b6484a157c8725889d0d68e792e13fc8d
%global helm_folder /usr/lib/helm
%global toolkit_version 0.1.0
%global helmchart_version 0.1.0
@ -24,9 +24,8 @@ Patch02: 0002-Remove-stale-Apache2-service-pids-when-a-POD-starts.patch
Patch03: 0003-Nova-console-ip-address-search-optionality.patch
Patch04: 0004-Nova-chart-Support-ephemeral-pool-creation.patch
Patch05: 0005-Nova-Add-support-for-disabling-Readiness-Liveness-pr.patch
Patch06: 0006-Add-Placement-Chart.patch
Patch07: 0007-Support-ingress-creation-for-keystone-admin-endpoint.patch
Patch08: 0008-Check-return-value-of-get-subnets-before-iterate-for.patch
Patch06: 0006-Support-ingress-creation-for-keystone-admin-endpoint.patch
Patch07: 0007-Allow-more-generic-overrides-for-placeme.patch
BuildRequires: helm
BuildRequires: openstack-helm-infra
@ -45,7 +44,6 @@ Openstack Helm charts
%patch05 -p1
%patch06 -p1
%patch07 -p1
%patch08 -p1
%build
# Stage helm-toolkit in the local repo

31
openstack-helm/files/0002-Remove-stale-Apache2-service-pids-when-a-POD-starts.patch
View File

@ -1,7 +1,7 @@
From a0e8c7e3764b168eaaa82d17d965f62d34766573 Mon Sep 17 00:00:00 2001
From b620ae1fa40aeadb4bbe2164fad7cb5c330acb78 Mon Sep 17 00:00:00 2001
From: Chris Friesen <chris.friesen@windriver.com>
Date: Wed, 28 Nov 2018 01:33:39 -0500
Subject: [PATCH 02] Remove stale Apache2 service pids when a POD starts.
Subject: [PATCH] Remove stale Apache2 service pids when a POD starts.
Stale Apache2 pids will prevent Apache2 from starting and will leave
the POD in a crashed state.
@ -17,14 +17,13 @@ Signed-off-by: Robert Church <robert.church@windriver.com>
---
ceilometer/templates/bin/_ceilometer-api.sh.tpl | 3 +++
keystone/templates/bin/_keystone-api.sh.tpl | 6 ++----
nova/templates/bin/_nova-placement-api.sh.tpl | 3 +++
3 files changed, 8 insertions(+), 4 deletions(-)
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ceilometer/templates/bin/_ceilometer-api.sh.tpl b/ceilometer/templates/bin/_ceilometer-api.sh.tpl
index 25b2f9e..3870b4e 100644
index 3ba90d9..4b77452 100644
--- a/ceilometer/templates/bin/_ceilometer-api.sh.tpl
+++ b/ceilometer/templates/bin/_ceilometer-api.sh.tpl
@@ -42,6 +42,9 @@ function start () {
@@ -40,6 +40,9 @@ function start () {
fi
fi
@ -35,10 +34,10 @@ index 25b2f9e..3870b4e 100644
exec {{ .Values.conf.software.apache2.binary }} {{ .Values.conf.software.apache2.start_parameters }}
}
diff --git a/keystone/templates/bin/_keystone-api.sh.tpl b/keystone/templates/bin/_keystone-api.sh.tpl
index 384ee8b..4c72310 100644
index 5d4286a..85740a0 100644
--- a/keystone/templates/bin/_keystone-api.sh.tpl
+++ b/keystone/templates/bin/_keystone-api.sh.tpl
@@ -43,10 +43,8 @@ function start () {
@@ -41,10 +41,8 @@ function start () {
source /etc/apache2/envvars
fi
@ -51,20 +50,6 @@ index 384ee8b..4c72310 100644
# Start Apache2
exec {{ .Values.conf.software.apache2.binary }} {{ .Values.conf.software.apache2.start_parameters }}
diff --git a/nova/templates/bin/_nova-placement-api.sh.tpl b/nova/templates/bin/_nova-placement-api.sh.tpl
index bc15a37..055d079 100644
--- a/nova/templates/bin/_nova-placement-api.sh.tpl
+++ b/nova/templates/bin/_nova-placement-api.sh.tpl
@@ -33,6 +33,9 @@ function start () {
fi
fi
+ # Get rid of stale pid file if present.
+ rm -f /var/run/apache2/*.pid
+
# Start Apache2
{{- if .Values.conf.software.apache2.a2enmod }}
{{- range .Values.conf.software.apache2.a2enmod }}
--
2.7.4
1.8.3.1

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

@ -1,7 +1,7 @@
From 64b22037b53e6423c465367c26a6d7255768ae17 Mon Sep 17 00:00:00 2001
From b5ff7217bca8b5af345a8630ce76b360022336b3 Mon Sep 17 00:00:00 2001
From: Gerry Kopec <Gerry.Kopec@windriver.com>
Date: Wed, 27 Mar 2019 00:35:57 -0400
Subject: [PATCH 03] Nova console/ip address search optionality
Subject: [PATCH] Nova console/ip address search optionality
Add options to nova to enable/disable the use of:
1. the vnc or spice server proxyclient address found by the console
@ -19,15 +19,15 @@ Signed-off-by: Gerry Kopec <Gerry.Kopec@windriver.com>
(cherry picked from commit f5e8ad20e35b770e5967f75f6f93f0a4dc6e3b41)
Signed-off-by: Robert Church <robert.church@windriver.com>
---
nova/templates/bin/_nova-compute.sh.tpl | 6 +++++-
nova/values.yaml | 3 ++-
2 files changed, 7 insertions(+), 2 deletions(-)
nova/templates/bin/_nova-compute.sh.tpl | 4 ++++
nova/values.yaml | 2 ++
2 files changed, 6 insertions(+)
diff --git a/nova/templates/bin/_nova-compute.sh.tpl b/nova/templates/bin/_nova-compute.sh.tpl
index c80da6d..4927908 100644
index 23ce347..60b0272 100644
--- a/nova/templates/bin/_nova-compute.sh.tpl
+++ b/nova/templates/bin/_nova-compute.sh.tpl
@@ -20,6 +20,10 @@ set -ex
@@ -18,9 +18,13 @@ set -ex
exec nova-compute \
--config-file /etc/nova/nova.conf \
@ -35,25 +35,25 @@ index c80da6d..4927908 100644
--config-file /tmp/pod-shared/nova-console.conf \
+{{- end }}
--config-file /tmp/pod-shared/nova-libvirt.conf \
- --config-file /tmp/pod-shared/nova-hypervisor.conf
\ No newline at end of file
{{- if and ( empty .Values.conf.nova.DEFAULT.host ) ( .Values.pod.use_fqdn.compute ) }}
--config-file /tmp/pod-shared/nova-compute-fqdn.conf \
{{- end }}
+{{- if .Values.conf.hypervisor.address_search_enabled }}
+ --config-file /tmp/pod-shared/nova-hypervisor.conf
--config-file /tmp/pod-shared/nova-hypervisor.conf
+{{- end }}
diff --git a/nova/values.yaml b/nova/values.yaml
index 29512ca..7ba2925 100644
index 6fb6237..ca92907 100644
--- a/nova/values.yaml
+++ b/nova/values.yaml
@@ -461,7 +461,7 @@ console:
@@ -512,6 +512,7 @@ console:
vncproxy:
# IF blank, search default routing interface
vncserver_proxyclient_interface:
-
+ address_search_enabled: true
ssh:
key_types:
- rsa
@@ -1598,6 +1598,7 @@ conf:
@@ -1658,6 +1659,7 @@ conf:
# If this option is set to None, the hostname of the migration target compute node will be used.
live_migration_interface:
hypervisor:
@ -62,5 +62,5 @@ index 29512ca..7ba2925 100644
host_interface:
# This list is the keys to exclude from the config file ingested by nova-compute
--
2.7.4
1.8.3.1

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

@ -1,7 +1,7 @@
From 4f6701c4cab07d9f54012e2a143173803f97ff3d Mon Sep 17 00:00:00 2001
From 8d1a2f90284bc5c3a7fcfbae73f0bdb2e5b03320 Mon Sep 17 00:00:00 2001
From: Irina Mihai <irina.mihai@windriver.com>
Date: Tue, 26 Feb 2019 17:43:53 +0000
Subject: [PATCH 04] Nova chart: Support ephemeral pool creation
Subject: [PATCH] Nova chart: Support ephemeral pool creation
If libvirt images_type is rbd, then we need to have the
images_rbd_pool present. These changes add a new job
@ -14,25 +14,23 @@ Signed-off-by: Irina Mihai <irina.mihai@windriver.com>
(cherry picked from commit 0afcb0b37cdcf57436e44867bac9242d8684ce81)
Signed-off-by: Robert Church <robert.church@windriver.com>
---
nova/templates/bin/_nova-storage-init.sh.tpl | 75 +++++++++++++
nova/templates/configmap-bin.yaml | 4 +-
nova/templates/job-storage-init.yaml | 155 +++++++++++++++++++++++++++
nova/values.yaml | 19 +++-
4 files changed, 251 insertions(+), 2 deletions(-)
nova/templates/bin/_nova-storage-init.sh.tpl | 73 +++++++++++++
nova/templates/configmap-bin.yaml | 2 +
nova/templates/job-storage-init.yaml | 153 +++++++++++++++++++++++++++
nova/values.yaml | 18 ++++
4 files changed, 246 insertions(+)
create mode 100644 nova/templates/bin/_nova-storage-init.sh.tpl
create mode 100644 nova/templates/job-storage-init.yaml
diff --git a/nova/templates/bin/_nova-storage-init.sh.tpl b/nova/templates/bin/_nova-storage-init.sh.tpl
new file mode 100644
index 0000000..f79fcff
index 0000000..416297f
--- /dev/null
+++ b/nova/templates/bin/_nova-storage-init.sh.tpl
@@ -0,0 +1,75 @@
@@ -0,0 +1,73 @@
+#!/bin/bash
+
+{{/*
+Copyright 2019 The Openstack-Helm Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
@ -104,17 +102,10 @@ index 0000000..f79fcff
+fi
+
diff --git a/nova/templates/configmap-bin.yaml b/nova/templates/configmap-bin.yaml
index c58b90b..268434f 100644
index c4e47fb..54571ac 100644
--- a/nova/templates/configmap-bin.yaml
+++ b/nova/templates/configmap-bin.yaml
@@ -1,5 +1,5 @@
{{/*
-Copyright 2017 The Openstack-Helm Authors.
+Copyright 2017-2019 The Openstack-Helm Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -83,6 +83,8 @@ data:
@@ -85,6 +85,8 @@ data:
{{ tuple "bin/_nova-console-proxy-init.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
nova-console-proxy-init-assets.sh: |
{{ tuple "bin/_nova-console-proxy-init-assets.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
@ -125,13 +116,11 @@ index c58b90b..268434f 100644
cell-setup.sh: |
diff --git a/nova/templates/job-storage-init.yaml b/nova/templates/job-storage-init.yaml
new file mode 100644
index 0000000..7d057fb
index 0000000..3963926
--- /dev/null
+++ b/nova/templates/job-storage-init.yaml
@@ -0,0 +1,155 @@
@@ -0,0 +1,153 @@
+{{/*
+Copyright 2019 The Openstack-Helm Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
@ -285,18 +274,18 @@ index 0000000..7d057fb
+{{- end }}
+
diff --git a/nova/values.yaml b/nova/values.yaml
index 7ba2925..97ef1b5 100644
index ca92907..3179231 100644
--- a/nova/values.yaml
+++ b/nova/values.yaml
@@ -87,6 +87,7 @@ images:
nova_service_cleaner: 'docker.io/port/ceph-config-helper:v1.10.3'
nova_spiceproxy: docker.io/openstackhelm/nova:ocata-ubuntu_xenial
nova_spiceproxy_assets: 'docker.io/kolla/ubuntu-source-nova-spicehtml5proxy:ocata'
@@ -85,6 +85,7 @@ images:
nova_service_cleaner: 'docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial'
nova_spiceproxy: 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'
test: docker.io/xrally/xrally-openstack:1.3.0
image_repo_sync: docker.io/docker:17.07.0
local_registry:
@@ -556,6 +557,14 @@ conf:
nova_wait_for_computes_init: gcr.io/google_containers/hyperkube-amd64:v1.11.6
@@ -608,6 +609,14 @@ conf:
user: "cinder"
keyring: null
secret_uuid: 457eb676-33da-42ec-9a8c-9293d545c337
@ -311,7 +300,7 @@ index 7ba2925..97ef1b5 100644
ssh: |
Host *
StrictHostKeyChecking no
@@ -1797,6 +1806,7 @@ secrets:
@@ -1865,6 +1874,7 @@ secrets:
placement:
placement:
public: placement-tls-public
@ -319,11 +308,10 @@ index 7ba2925..97ef1b5 100644
# typically overridden by environmental
# values, but should include all endpoints
@@ -2482,7 +2492,13 @@ pod:
@@ -2572,6 +2582,13 @@ pod:
limits:
memory: "1024Mi"
cpu: "2000m"
-
+ storage_init:
+ requests:
+ memory: "128Mi"
@ -331,10 +319,10 @@ index 7ba2925..97ef1b5 100644
+ limits:
+ memory: "1024Mi"
+ cpu: "2000m"
network_policy:
nova:
# TODO(lamt): Need to tighten this ingress for security.
@@ -2545,6 +2561,7 @@ manifests:
@@ -2619,6 +2636,7 @@ manifests:
job_ks_placement_service: true
job_ks_placement_user: true
job_cell_setup: true
@ -343,5 +331,5 @@ index 7ba2925..97ef1b5 100644
pdb_placement: true
pdb_osapi: true
--
2.7.4
1.8.3.1

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

@ -1,8 +1,7 @@
From af94c98eee44769a2c1e8f211029f8346a13ebc2 Mon Sep 17 00:00:00 2001
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 05] Nova: Add support for disabling Readiness/Liveness
probes
Subject: [PATCH] Nova: Add support for disabling Readiness/Liveness probes
With the introduction of Readiness/Liveness probes in
Ib8e4b93486588320fd2d562c3bc90b65844e52e5, some probes are failing and
@ -19,14 +18,14 @@ Signed-off-by: Robert Church <robert.church@windriver.com>
nova/templates/deployment-novncproxy.yaml | 4 ++++
nova/templates/deployment-scheduler.yaml | 4 ++++
nova/templates/deployment-spiceproxy.yaml | 4 ++++
nova/values.yaml | 28 ++++++++++++++++++++++++++++
7 files changed, 52 insertions(+)
nova/values.yaml | 27 +++++++++++++++++++++++++++
7 files changed, 51 insertions(+)
diff --git a/nova/templates/daemonset-compute.yaml b/nova/templates/daemonset-compute.yaml
index feea6ab..86dc2b9 100644
index c623f52..3d0908f 100644
--- a/nova/templates/daemonset-compute.yaml
+++ b/nova/templates/daemonset-compute.yaml
@@ -190,6 +190,7 @@ spec:
@@ -194,6 +194,7 @@ spec:
- name: LIBVIRT_CEPH_SECRET_UUID
value: "{{ .Values.conf.ceph.secret_uuid }}"
{{ end }}
@ -34,28 +33,28 @@ index feea6ab..86dc2b9 100644
readinessProbe:
exec:
command:
@@ -202,6 +203,8 @@ spec:
@@ -209,6 +210,8 @@ spec:
initialDelaySeconds: 80
periodSeconds: 90
timeoutSeconds: 70
periodSeconds: 190
timeoutSeconds: 185
+ {{- end }}
+ {{- if .Values.pod.probes.liveness.nova_compute.enabled }}
livenessProbe:
exec:
command:
@@ -215,6 +218,7 @@ spec:
@@ -225,6 +228,7 @@ spec:
initialDelaySeconds: 120
periodSeconds: 90
timeoutSeconds: 70
periodSeconds: 600
timeoutSeconds: 580
+ {{- end }}
command:
- /tmp/nova-compute.sh
volumeMounts:
terminationMessagePath: /var/log/termination-log
diff --git a/nova/templates/deployment-conductor.yaml b/nova/templates/deployment-conductor.yaml
index f927afa..0caa006 100644
index 7fe578a..a4d3852 100644
--- a/nova/templates/deployment-conductor.yaml
+++ b/nova/templates/deployment-conductor.yaml
@@ -59,6 +59,7 @@ spec:
@@ -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 }}
@ -63,28 +62,28 @@ index f927afa..0caa006 100644
readinessProbe:
exec:
command:
@@ -71,6 +72,8 @@ spec:
@@ -70,6 +71,8 @@ spec:
initialDelaySeconds: 80
periodSeconds: 90
timeoutSeconds: 70
periodSeconds: 190
timeoutSeconds: 185
+ {{- end }}
+ {{- if .Values.pod.probes.liveness.nova_conductor.enabled }}
livenessProbe:
exec:
command:
@@ -84,6 +87,7 @@ spec:
@@ -83,6 +86,7 @@ spec:
initialDelaySeconds: 120
periodSeconds: 90
timeoutSeconds: 70
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 b9cb717..0f590e0 100644
index 575896c..a9a58b2 100644
--- a/nova/templates/deployment-consoleauth.yaml
+++ b/nova/templates/deployment-consoleauth.yaml
@@ -59,6 +59,7 @@ spec:
@@ -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 }}
@ -92,28 +91,28 @@ index b9cb717..0f590e0 100644
readinessProbe:
exec:
command:
@@ -71,6 +72,8 @@ spec:
@@ -70,6 +71,8 @@ spec:
initialDelaySeconds: 80
periodSeconds: 90
timeoutSeconds: 70
periodSeconds: 190
timeoutSeconds: 185
+ {{- end }}
+ {{- if .Values.pod.probes.liveness.nova_consoleauth.enabled }}
livenessProbe:
exec:
command:
@@ -84,6 +87,7 @@ spec:
@@ -83,6 +86,7 @@ spec:
initialDelaySeconds: 120
periodSeconds: 90
timeoutSeconds: 70
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 42a52af..495c1ac 100644
index 1291523..723ee88 100644
--- a/nova/templates/deployment-novncproxy.yaml
+++ b/nova/templates/deployment-novncproxy.yaml
@@ -103,14 +103,18 @@ spec:
@@ -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 }}
@ -133,10 +132,10 @@ index 42a52af..495c1ac 100644
- /tmp/nova-console-proxy.sh
ports:
diff --git a/nova/templates/deployment-scheduler.yaml b/nova/templates/deployment-scheduler.yaml
index 05ee949..9a30fa6 100644
index d49682c..cdee77f 100644
--- a/nova/templates/deployment-scheduler.yaml
+++ b/nova/templates/deployment-scheduler.yaml
@@ -59,6 +59,7 @@ spec:
@@ -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 }}
@ -144,28 +143,28 @@ index 05ee949..9a30fa6 100644
readinessProbe:
exec:
command:
@@ -72,6 +73,8 @@ spec:
@@ -70,6 +71,8 @@ spec:
initialDelaySeconds: 80
periodSeconds: 90
timeoutSeconds: 70
periodSeconds: 190
timeoutSeconds: 185
+ {{- end }}
+ {{- if .Values.pod.probes.liveness.nova_scheduler.enabled }}
livenessProbe:
exec:
command:
@@ -86,6 +89,7 @@ spec:
@@ -83,6 +86,7 @@ spec:
initialDelaySeconds: 120
periodSeconds: 90
timeoutSeconds: 70
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 a221656..038c85c 100644
index 7278829..13e273e 100644
--- a/nova/templates/deployment-spiceproxy.yaml
+++ b/nova/templates/deployment-spiceproxy.yaml
@@ -101,14 +101,18 @@ spec:
@@ -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 }}
@ -185,10 +184,10 @@ index a221656..038c85c 100644
- /tmp/nova-console-proxy.sh
ports:
diff --git a/nova/values.yaml b/nova/values.yaml
index 97ef1b5..4092329 100644
index 3179231..c445d15 100644
--- a/nova/values.yaml
+++ b/nova/values.yaml
@@ -2499,6 +2499,34 @@ pod:
@@ -2589,6 +2589,33 @@ pod:
limits:
memory: "1024Mi"
cpu: "2000m"
@ -219,10 +218,9 @@ index 97ef1b5..4092329 100644
+ enabled: true
+ nova_spiceproxy:
+ enabled: true
+
network_policy:
nova:
# TODO(lamt): Need to tighten this ingress for security.
--
2.7.4
1.8.3.1

1114
openstack-helm/files/0006-Add-Placement-Chart.patch
View File

File diff suppressed because it is too large Load Diff

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

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

@ -0,0 +1,78 @@
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

52
openstack-helm/files/0008-Check-return-value-of-get-subnets-before-iterate-for.patch
View File

@ -1,52 +0,0 @@
From 29a7eea2465284bc5ed5a8f95bc14d6c6c9f0e5e Mon Sep 17 00:00:00 2001
From: Mingyuan Qi <mingyuan.qi@intel.com>
Date: Wed, 11 Dec 2019 08:48:09 +0000
Subject: [PATCH] Check return value of get subnets before iterate for ironic
With the update of openstack clients:
openstack client >= 4.0.0
neutron client >= 6.14.0
neturon lib >= 1.29.1
The command 'openstack network show ${network} -f value -c subnets'
returns '[]' instead of null string if no subnets found in the
specific network. This commit adds a check logic to avoid subsequent
command returns error by using '[]' as subnet input.
Change-Id: I7e7d5209227b0e34131b7715dbd3faa6066a94b7
Signed-off-by: Mingyuan Qi <mingyuan.qi@intel.com>
---
ironic/templates/bin/_manage-cleaning-network.sh.tpl | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/ironic/templates/bin/_manage-cleaning-network.sh.tpl b/ironic/templates/bin/_manage-cleaning-network.sh.tpl
index 47381a1..2a2af3a 100644
--- a/ironic/templates/bin/_manage-cleaning-network.sh.tpl
+++ b/ironic/templates/bin/_manage-cleaning-network.sh.tpl
@@ -28,13 +28,16 @@ else
IRONIC_NEUTRON_CLEANING_NET_ID=$(openstack network show ${neutron_network_name} -f value -c id)
fi
-for SUBNET in $(openstack network show $IRONIC_NEUTRON_CLEANING_NET_ID -f value -c subnets); do
- CURRENT_SUBNET=$(openstack subnet show $SUBNET -f value -c name)
- if [ "x${CURRENT_SUBNET}" == "x${neutron_subnet_name}" ]; then
- openstack subnet show ${neutron_subnet_name}
- SUBNET_EXISTS=true
- fi
-done
+SUBNETS=$(openstack network show $IRONIC_NEUTRON_CLEANING_NET_ID -f value -c subnets)
+if [ "x${SUBNETS}" != "x[]" ]; then
+ for SUBNET in ${SUBNETS}; do
+ CURRENT_SUBNET=$(openstack subnet show $SUBNET -f value -c name)
+ if [ "x${CURRENT_SUBNET}" == "x${neutron_subnet_name}" ]; then
+ openstack subnet show ${neutron_subnet_name}
+ SUBNET_EXISTS=true
+ fi
+ done
+fi
if [ "x${SUBNET_EXISTS}" != "xtrue" ]; then
openstack subnet create \
--
1.8.3.1