starlingx/openstack-armada-app
Code Issues Proposed changes

Rebase openstack-helm and openstack-helm-infra

Browse Source 
Rebase to a current version of the upstream repos. This will retire the
reverted commits that we needed to enable per host overrides as this was
fixed upstream.

Change-Id: Iacbdd666687b8bc12053f9d3dd833f9896a508cd
Depends-On: Iedb814ce0c72a59ab0ce5e72e4601082b61f82b0
Story: 2003909
Task: 27632
Signed-off-by: Robert Church <robert.church@windriver.com>
This commit is contained in:
Robert Church 2018-11-14 00:49:40 -05:00
parent 46103750d0
commit 537af44966
12 changed files with 109 additions and 2547 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,8 @@
TAR_NAME=openstack-helm-infra
SHA=5ec85a5d70fab468160d2fdafed1a2a7a5151405
SHA=5d356f9265b337b75f605dee839faa8cd0ed3ab2
VERSION=1.0.0
TAR="$TAR_NAME-$SHA.tar.gz"
COPY_LIST="${CGCS_BASE}/downloads/$TAR $PKG_BASE/files/*"
TIS_PATCH_VER=3
TIS_PATCH_VER=4

6
openstack-helm-infra/centos/openstack-helm-infra.spec
View File

@ -1,4 +1,4 @@
%global sha 5ec85a5d70fab468160d2fdafed1a2a7a5151405
%global sha 5d356f9265b337b75f605dee839faa8cd0ed3ab2
%global helm_folder /usr/lib/helm
Summary: Openstack-Helm-Infra charts
@ -15,8 +15,6 @@ Source0: %{name}-%{sha}.tar.gz
BuildArch: noarch
Patch01: 0001-gnocchi-remove-gnocchi-upgrade-option-and-set-coordi.patch
Patch02: 0002-Revert-Helm-Toolkit-Move-sensitive-config-data-to-se.patch
Patch03: 0003-Revert-gnocchi-use-of-k8s-secret-to-store-config.patch
BuildRequires: helm
@ -26,8 +24,6 @@ Openstack Helm Infra charts
%prep
%setup -n openstack-helm-infra
%patch01 -p1
%patch02 -p1
%patch03 -p1
%build
# initialize helm and build the toolkit

6
openstack-helm-infra/files/0001-gnocchi-remove-gnocchi-upgrade-option-and-set-coordi.patch
View File

@ -1,7 +1,7 @@
From 5d78a8df854340225c32d025e921efd5c9dc2be1 Mon Sep 17 00:00:00 2001
From c699219876325fb01c23a4d240f9ecf6f145cd5a Mon Sep 17 00:00:00 2001
From: Angie Wang <angie.wang@windriver.com>
Date: Wed, 26 Sep 2018 17:01:28 +0000
Subject: [PATCH 1/3] gnocchi: remove gnocchi upgrade option and set
Subject: [PATCH] gnocchi: remove gnocchi upgrade option and set
coordination_url
- Remove the gnocchi upgrade option "--create-legacy-resource-types" as
@ -40,5 +40,5 @@ index 83d3f14..bdf6acc 100644
{{- $_ := tuple "oslo_db" "internal" "gnocchi" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.gnocchi.database "connection" -}}
{{- end -}}
--
1.8.3.1
2.18.0

140
openstack-helm-infra/files/0002-Revert-Helm-Toolkit-Move-sensitive-config-data-to-se.patch
View File

@ -1,140 +0,0 @@
From 82c8a765764c034365ba487b3abbd1da542b0a4c Mon Sep 17 00:00:00 2001
From: Gerry Kopec <gerry.kopec@windriver.com>
Date: Tue, 2 Oct 2018 17:11:54 +0000
Subject: [PATCH 2/3] Revert "Helm-Toolkit: Move sensitive config data to
secrets."
This reverts commit 6186fb6675d57235c22b88d9b3b2215d4c06b082.
Conflicts:
.zuul.yaml
To allow per host overrides to work we need to temporarily revert this
commit. This should be put back once upstream has fixed the issue:
https://storyboard.openstack.org/#!/story/2003873
---
helm-toolkit/templates/manifests/_job-bootstrap.yaml | 4 ++--
.../templates/manifests/_job-db-drop-mysql.yaml.tpl | 4 ++--
.../templates/manifests/_job-db-init-mysql.yaml.tpl | 4 ++--
helm-toolkit/templates/manifests/_job-db-sync.yaml.tpl | 4 ++--
.../templates/snippets/_values_template_renderer.tpl | 14 ++------------
ldap/templates/configmap-etc.yaml | 7 +++----
6 files changed, 13 insertions(+), 24 deletions(-)
diff --git a/helm-toolkit/templates/manifests/_job-bootstrap.yaml b/helm-toolkit/templates/manifests/_job-bootstrap.yaml
index 8afc50e..a3276d5 100644
--- a/helm-toolkit/templates/manifests/_job-bootstrap.yaml
+++ b/helm-toolkit/templates/manifests/_job-bootstrap.yaml
@@ -92,8 +92,8 @@ spec:
- name: etc-service
emptyDir: {}
- name: bootstrap-conf
- secret:
- secretName: {{ $configMapEtc | quote }}
+ configMap:
+ name: {{ $configMapEtc | quote }}
defaultMode: 0444
{{- if $podVols }}
{{ $podVols | toYaml | indent 8 }}
diff --git a/helm-toolkit/templates/manifests/_job-db-drop-mysql.yaml.tpl b/helm-toolkit/templates/manifests/_job-db-drop-mysql.yaml.tpl
index e813c32..27b347a 100644
--- a/helm-toolkit/templates/manifests/_job-db-drop-mysql.yaml.tpl
+++ b/helm-toolkit/templates/manifests/_job-db-drop-mysql.yaml.tpl
@@ -118,8 +118,8 @@ spec:
- name: etc-service
emptyDir: {}
- name: db-drop-conf
- secret:
- secretName: {{ $configMapEtc | quote }}
+ configMap:
+ name: {{ $configMapEtc | quote }}
defaultMode: 0444
{{- end -}}
{{- end -}}
diff --git a/helm-toolkit/templates/manifests/_job-db-init-mysql.yaml.tpl b/helm-toolkit/templates/manifests/_job-db-init-mysql.yaml.tpl
index dea5864..8e7e436 100644
--- a/helm-toolkit/templates/manifests/_job-db-init-mysql.yaml.tpl
+++ b/helm-toolkit/templates/manifests/_job-db-init-mysql.yaml.tpl
@@ -115,8 +115,8 @@ spec:
- name: etc-service
emptyDir: {}
- name: db-init-conf
- secret:
- secretName: {{ $configMapEtc | quote }}
+ configMap:
+ name: {{ $configMapEtc | quote }}
defaultMode: 0444
{{- end -}}
{{- end -}}
diff --git a/helm-toolkit/templates/manifests/_job-db-sync.yaml.tpl b/helm-toolkit/templates/manifests/_job-db-sync.yaml.tpl
index 134e99b..df64ecf 100644
--- a/helm-toolkit/templates/manifests/_job-db-sync.yaml.tpl
+++ b/helm-toolkit/templates/manifests/_job-db-sync.yaml.tpl
@@ -88,8 +88,8 @@ spec:
- name: etc-service
emptyDir: {}
- name: db-sync-conf
- secret:
- secretName: {{ $configMapEtc | quote }}
+ configMap:
+ name: {{ $configMapEtc | quote }}
defaultMode: 0444
{{- if $podVols }}
{{ $podVols | toYaml | indent 8 }}
diff --git a/helm-toolkit/templates/snippets/_values_template_renderer.tpl b/helm-toolkit/templates/snippets/_values_template_renderer.tpl
index 88a279d..67f099d 100644
--- a/helm-toolkit/templates/snippets/_values_template_renderer.tpl
+++ b/helm-toolkit/templates/snippets/_values_template_renderer.tpl
@@ -67,23 +67,13 @@ return: |
{{- $envAll := index . "envAll" -}}
{{- $template := index . "template" -}}
{{- $key := index . "key" -}}
-{{- $format := index . "format" | default "configMap" -}}
{{- with $envAll -}}
{{- $templateRendered := tpl ( $template | toYaml ) . }}
-{{- if eq $format "Secret" }}
-{{- if hasPrefix "|\n" $templateRendered }}
-{{ $key }}: {{ regexReplaceAllLiteral "\n " ( $templateRendered | trimPrefix "|\n" | trimPrefix " " ) "\n" | b64enc }}
-{{- else }}
-{{ $key }}: {{ $templateRendered | b64enc }}
-{{- end -}}
-{{- else }}
-{{- if hasPrefix "|\n" $templateRendered }}
-{{ $key }}: |
-{{ regexReplaceAllLiteral "\n " ( $templateRendered | trimPrefix "|\n" | trimPrefix " " ) "\n" | indent 2 }}
+{{- if hasPrefix "|\n" $templateRendered }}
+{{ $key }}: {{ $templateRendered }}
{{- else }}
{{ $key }}: |
{{ $templateRendered | indent 2 }}
{{- end -}}
{{- end -}}
{{- end -}}
-{{- end -}}
diff --git a/ldap/templates/configmap-etc.yaml b/ldap/templates/configmap-etc.yaml
index 3fa7c37..e724e6d 100644
--- a/ldap/templates/configmap-etc.yaml
+++ b/ldap/templates/configmap-etc.yaml
@@ -13,16 +13,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/}}
-
{{- if .Values.manifests.configmap_etc }}
---
apiVersion: v1
-kind: Secret
+kind: ConfigMap
metadata:
name: ldap-etc
-type: Opaque
data:
{{- if .Values.bootstrap.enabled }}
- sample_data.ldif: {{ .Values.data.sample | b64enc }}
+ sample_data.ldif: |
+{{ .Values.data.sample | indent 4 }}
{{- end }}
{{- end }}
--
1.8.3.1

144
openstack-helm-infra/files/0003-Revert-gnocchi-use-of-k8s-secret-to-store-config.patch
View File

@ -1,144 +0,0 @@
From 4c2dd3b4e64a898613106c82dddaffd5e5ab09a0 Mon Sep 17 00:00:00 2001
From: Gerry Kopec <gerry.kopec@windriver.com>
Date: Wed, 3 Oct 2018 22:32:13 +0000
Subject: [PATCH 3/3] Revert gnocchi use of k8s secret to store config
To allow per host overrides to work we need to temporarily revert secrets
related changes. In the original secrets commit:
83b91e6e Openstack: Use k8s secret to store config
gnocchi was in openstack-helm, but was subsequently moved to
openstack-helm-infra. This commit reverts the gnocchi specific changes.
This commit should be put back once upstream has fixed the issue:
https://storyboard.openstack.org/#!/story/2003873
Reviewed by Angie.
---
gnocchi/templates/configmap-etc.yaml | 14 ++++++++------
gnocchi/templates/daemonset-metricd.yaml | 4 ++--
gnocchi/templates/daemonset-statsd.yaml | 4 ++--
gnocchi/templates/deployment-api.yaml | 4 ++--
gnocchi/templates/job-db-init-indexer.yaml | 4 ++--
gnocchi/templates/job-db-sync.yaml | 4 ++--
gnocchi/templates/pod-gnocchi-test.yaml | 4 ++--
7 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/gnocchi/templates/configmap-etc.yaml b/gnocchi/templates/configmap-etc.yaml
index bdf6acc..eb2fd1f 100644
--- a/gnocchi/templates/configmap-etc.yaml
+++ b/gnocchi/templates/configmap-etc.yaml
@@ -91,13 +91,15 @@ limitations under the License.
{{- $envAll := . }}
---
apiVersion: v1
-kind: Secret
+kind: ConfigMap
metadata:
name: gnocchi-etc
-type: Opaque
data:
- gnocchi.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.gnocchi | b64enc }}
- api-paste.ini: {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | b64enc }}
- policy.json: {{ toJson .Values.conf.policy | b64enc }}
-{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.apache "key" "wsgi-gnocchi.conf" "format" "Secret" ) | indent 2 }}
+ gnocchi.conf: |
+{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.gnocchi | indent 4 }}
+ api-paste.ini: |
+{{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | indent 4 }}
+ policy.json: |
+{{ toJson .Values.conf.policy | indent 4 }}
+{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.apache "key" "wsgi-gnocchi.conf") | indent 2 }}
{{- end }}
diff --git a/gnocchi/templates/daemonset-metricd.yaml b/gnocchi/templates/daemonset-metricd.yaml
index ccd6b0f..057fb95 100644
--- a/gnocchi/templates/daemonset-metricd.yaml
+++ b/gnocchi/templates/daemonset-metricd.yaml
@@ -98,8 +98,8 @@ spec:
- name: pod-etc-gnocchi
emptyDir: {}
- name: gnocchi-etc
- secret:
- secretName: gnocchi-etc
+ configMap:
+ name: gnocchi-etc
defaultMode: 0444
- name: gnocchi-bin
configMap:
diff --git a/gnocchi/templates/daemonset-statsd.yaml b/gnocchi/templates/daemonset-statsd.yaml
index 343073e..9560a16 100644
--- a/gnocchi/templates/daemonset-statsd.yaml
+++ b/gnocchi/templates/daemonset-statsd.yaml
@@ -104,8 +104,8 @@ spec:
- name: pod-etc-gnocchi
emptyDir: {}
- name: gnocchi-etc
- secret:
- secretName: gnocchi-etc
+ configMap:
+ name: gnocchi-etc
defaultMode: 0444
- name: gnocchi-bin
configMap:
diff --git a/gnocchi/templates/deployment-api.yaml b/gnocchi/templates/deployment-api.yaml
index 6425d46..b26a508 100644
--- a/gnocchi/templates/deployment-api.yaml
+++ b/gnocchi/templates/deployment-api.yaml
@@ -123,8 +123,8 @@ spec:
- name: pod-etc-gnocchi
emptyDir: {}
- name: gnocchi-etc
- secret:
- secretName: gnocchi-etc
+ configMap:
+ name: gnocchi-etc
defaultMode: 0444
- name: gnocchi-bin
configMap:
diff --git a/gnocchi/templates/job-db-init-indexer.yaml b/gnocchi/templates/job-db-init-indexer.yaml
index ad47290..19abe9d 100644
--- a/gnocchi/templates/job-db-init-indexer.yaml
+++ b/gnocchi/templates/job-db-init-indexer.yaml
@@ -66,8 +66,8 @@ spec:
readOnly: true
volumes:
- name: gnocchi-etc
- secret:
- secretName: gnocchi-etc
+ configMap:
+ name: gnocchi-etc
defaultMode: 0444
- name: pod-etc-gnocchi
emptyDir: {}
diff --git a/gnocchi/templates/job-db-sync.yaml b/gnocchi/templates/job-db-sync.yaml
index bdb0f95..5ee99ae 100644
--- a/gnocchi/templates/job-db-sync.yaml
+++ b/gnocchi/templates/job-db-sync.yaml
@@ -76,8 +76,8 @@ spec:
readOnly: true
volumes:
- name: gnocchi-etc
- secret:
- secretName: gnocchi-etc
+ configMap:
+ name: gnocchi-etc
defaultMode: 0444
- name: gnocchi-bin
configMap:
diff --git a/gnocchi/templates/pod-gnocchi-test.yaml b/gnocchi/templates/pod-gnocchi-test.yaml
index df02983..2835c0e 100644
--- a/gnocchi/templates/pod-gnocchi-test.yaml
+++ b/gnocchi/templates/pod-gnocchi-test.yaml
@@ -70,8 +70,8 @@ spec:
{{ if $mounts_gnocchi_tests.volumeMounts }}{{ toYaml $mounts_gnocchi_tests.volumeMounts | indent 8 }}{{ end }}
volumes:
- name: gnocchi-etc
- secret:
- secretName: gnocchi-etc
+ configMap:
+ name: gnocchi-etc
defaultMode: 0444
- name: gnocchi-bin
configMap:
--
1.8.3.1

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

@ -1,8 +1,8 @@
TAR_NAME=openstack-helm
SHA=add7a9bc1175f6fafa8ea2918bc1d62209aaf243
SHA=9d72fe1a501bc609a875eebf7b6274e18600ed70
VERSION=1.0.0
TAR="$TAR_NAME-$SHA.tar.gz"
COPY_LIST="${CGCS_BASE}/downloads/$TAR $PKG_BASE/files/* "
TIS_PATCH_VER=3
TIS_PATCH_VER=4

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

@ -1,4 +1,4 @@
%global sha add7a9bc1175f6fafa8ea2918bc1d62209aaf243
%global sha 9d72fe1a501bc609a875eebf7b6274e18600ed70
%global helm_folder /usr/lib/helm
%global toolkit_version 0.1.0
%global helmchart_version 0.1.0
@ -16,11 +16,9 @@ Source0: %{name}-%{sha}.tar.gz
BuildArch: noarch
Patch01: 0001-Revert-Neutron-TaaS-support-as-L2-Extension.patch
Patch02: 0002-Revert-Openstack-Use-k8s-secret-to-store-config.patch
Patch03: 0003-ceilometer-chart-updates.patch
Patch04: 0004-Add-Aodh-Chart.patch
Patch05: 0005-Add-Panko-Chart.patch
Patch01: 0001-ceilometer-chart-updates.patch
Patch02: 0002-Add-Aodh-Chart.patch
Patch03: 0003-Add-Panko-Chart.patch
BuildRequires: helm
BuildRequires: openstack-helm-infra
@ -34,8 +32,6 @@ Openstack Helm charts
%patch01 -p1
%patch02 -p1
%patch03 -p1
%patch04 -p1
%patch05 -p1
%build
# initialize helm and stage the toolkit

334
openstack-helm/files/0001-Revert-Neutron-TaaS-support-as-L2-Extension.patch
View File

@ -1,334 +0,0 @@
From c225120329e2d4c69e5ff1b150c88575258de1c8 Mon Sep 17 00:00:00 2001
From: Gerry Kopec <gerry.kopec@windriver.com>
Date: Tue, 2 Oct 2018 03:03:33 +0000
Subject: [PATCH 1/3] Revert "Neutron TaaS support as L2 Extension"
This reverts commit 2f5a1c0c7751ba340d493f3c6f08a23454a7cc38.
To allow per host overrides to work we need to temporarily revert this
commit. This should be put back once upstream has fixed the issue:
https://storyboard.openstack.org/#!/story/2003873
---
neutron/templates/bin/_db-sync.sh.tpl | 5 +---
.../bin/_neutron-openvswitch-agent.sh.tpl | 5 +---
neutron/templates/bin/_neutron-server.sh.tpl | 5 +---
neutron/templates/bin/_neutron-sriov-agent.sh.tpl | 5 +---
neutron/templates/configmap-etc.yaml | 2 --
neutron/templates/daemonset-ovs-agent.yaml | 20 ----------------
neutron/templates/daemonset-sriov-agent.yaml | 20 ----------------
neutron/templates/deployment-server.yaml | 6 -----
neutron/values.yaml | 28 ----------------------
9 files changed, 4 insertions(+), 92 deletions(-)
diff --git a/neutron/templates/bin/_db-sync.sh.tpl b/neutron/templates/bin/_db-sync.sh.tpl
index f8704c0..5bd137b 100644
--- a/neutron/templates/bin/_db-sync.sh.tpl
+++ b/neutron/templates/bin/_db-sync.sh.tpl
@@ -1,7 +1,7 @@
#!/bin/bash
{{/*
-Copyright 2017 The Openstack-Helm Authors.
+Copyright 2017-2018 OpenStack Foundation.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -21,7 +21,4 @@ set -ex
neutron-db-manage \
--config-file /etc/neutron/neutron.conf \
--config-file /etc/neutron/plugins/ml2/ml2_conf.ini \
-{{- if .Values.conf.plugins.taas.taas.enabled }}
- --subproject tap-as-a-service \
-{{- end }}
upgrade head
diff --git a/neutron/templates/bin/_neutron-openvswitch-agent.sh.tpl b/neutron/templates/bin/_neutron-openvswitch-agent.sh.tpl
index a9b90d4..a91c929 100644
--- a/neutron/templates/bin/_neutron-openvswitch-agent.sh.tpl
+++ b/neutron/templates/bin/_neutron-openvswitch-agent.sh.tpl
@@ -1,7 +1,7 @@
#!/bin/bash
{{/*
-Copyright 2017 The Openstack-Helm Authors.
+Copyright 2017-2018 OpenStack Foundation.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -23,6 +23,3 @@ exec neutron-openvswitch-agent \
--config-file /etc/neutron/plugins/ml2/ml2_conf.ini \
--config-file /tmp/pod-shared/ml2-local-ip.ini \
--config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini
-{{- if .Values.conf.plugins.taas.taas.enabled }} \
- --config-file /etc/neutron/plugins/ml2/taas.ini
-{{- end }}
diff --git a/neutron/templates/bin/_neutron-server.sh.tpl b/neutron/templates/bin/_neutron-server.sh.tpl
index a4de32d..cd24dd3 100644
--- a/neutron/templates/bin/_neutron-server.sh.tpl
+++ b/neutron/templates/bin/_neutron-server.sh.tpl
@@ -1,7 +1,7 @@
#!/bin/bash
{{/*
-Copyright 2017 The Openstack-Helm Authors.
+Copyright 2017-2018 OpenStack Foundation.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -23,9 +23,6 @@ function start () {
exec neutron-server \
--config-file /etc/neutron/neutron.conf \
--config-file /etc/neutron/plugins/ml2/ml2_conf.ini
-{{- if .Values.conf.plugins.taas.taas.enabled }} \
- --config-file /etc/neutron/taas_plugin.ini
-{{- end }}
{{- if ( has "sriov" .Values.network.backend ) }} \
--config-file /etc/neutron/plugins/ml2/sriov_agent.ini
{{- end }}
diff --git a/neutron/templates/bin/_neutron-sriov-agent.sh.tpl b/neutron/templates/bin/_neutron-sriov-agent.sh.tpl
index 98bf5e9..bf158d2 100644
--- a/neutron/templates/bin/_neutron-sriov-agent.sh.tpl
+++ b/neutron/templates/bin/_neutron-sriov-agent.sh.tpl
@@ -1,7 +1,7 @@
#!/bin/bash
{{/*
-Copyright 2017 The Openstack-Helm Authors.
+Copyright 2017-2018 OpenStack Foundation.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -22,6 +22,3 @@ exec neutron-sriov-nic-agent \
--config-file /etc/neutron/neutron.conf \
--config-file /etc/neutron/plugins/ml2/ml2_conf.ini \
--config-file /etc/neutron/plugins/ml2/sriov_agent.ini
-{{- if .Values.conf.plugins.taas.taas.enabled }} \
- --config-file /etc/neutron/plugins/ml2/taas.ini
-{{- end }}
diff --git a/neutron/templates/configmap-etc.yaml b/neutron/templates/configmap-etc.yaml
index 027602b..7293df0 100644
--- a/neutron/templates/configmap-etc.yaml
+++ b/neutron/templates/configmap-etc.yaml
@@ -185,10 +185,8 @@ data:
l3_agent.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.l3_agent | b64enc }}
metadata_agent.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.metadata_agent | b64enc }}
metering_agent.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.metering_agent | b64enc }}
- taas_plugin.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.taas_plugin | b64enc }}
ml2_conf.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.ml2_conf | b64enc }}
ml2_conf_sriov.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.ml2_conf_sriov | b64enc }}
- taas.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.taas | b64enc }}
macvtap_agent.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.macvtap_agent | b64enc }}
linuxbridge_agent.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.linuxbridge_agent | b64enc }}
openvswitch_agent.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.openvswitch_agent | b64enc }}
diff --git a/neutron/templates/daemonset-ovs-agent.yaml b/neutron/templates/daemonset-ovs-agent.yaml
index 34aba25..3ca1ca3 100644
--- a/neutron/templates/daemonset-ovs-agent.yaml
+++ b/neutron/templates/daemonset-ovs-agent.yaml
@@ -102,12 +102,6 @@ spec:
mountPath: /etc/neutron/plugins/ml2/openvswitch_agent.ini
subPath: openvswitch_agent.ini
readOnly: true
- {{- if .Values.conf.plugins.taas.taas.enabled }}
- - name: neutron-etc
- mountPath: /etc/neutron/plugins/ml2/taas.ini
- subPath: taas.ini
- readOnly: true
- {{- end }}
- name: neutron-etc
# NOTE (Portdirect): We mount here to override Kollas
# custom sudoers file when using Kolla images, this
@@ -121,9 +115,6 @@ spec:
readOnly: true
{{- range $key, $value := $envAll.Values.conf.rootwrap_filters }}
{{- if ( has "ovs_agent" $value.pods ) }}
- {{- if and ( eq "taas" $key ) (not $envAll.Values.conf.plugins.taas.taas.enabled) }}
- ## if taas is not enabled, do not include taas.filters
- {{- else }}
{{- $filePrefix := replace "_" "-" $key }}
{{- $rootwrapFile := printf "/etc/neutron/rootwrap.d/%s.filters" $filePrefix }}
- name: neutron-etc
@@ -132,7 +123,6 @@ spec:
readOnly: true
{{- end }}
{{- end }}
- {{- end }}
- name: run
mountPath: /run
{{ if $mounts_neutron_ovs_agent.volumeMounts }}{{ toYaml $mounts_neutron_ovs_agent.volumeMounts | indent 12 }}{{ end }}
@@ -176,12 +166,6 @@ spec:
mountPath: /etc/neutron/plugins/ml2/openvswitch_agent.ini
subPath: openvswitch_agent.ini
readOnly: true
- {{- if .Values.conf.plugins.taas.taas.enabled }}
- - name: neutron-etc
- mountPath: /etc/neutron/plugins/ml2/taas.ini
- subPath: taas.ini
- readOnly: true
- {{- end }}
- name: neutron-etc
# NOTE (Portdirect): We mount here to override Kollas
# custom sudoers file when using Kolla images, this
@@ -195,9 +179,6 @@ spec:
readOnly: true
{{- range $key, $value := $envAll.Values.conf.rootwrap_filters }}
{{- if ( has "ovs_agent" $value.pods ) }}
- {{- if and ( eq "taas" $key ) (not $envAll.Values.conf.plugins.taas.taas.enabled) }}
- ## if taas is not enabled, do not include taas.filters
- {{- else }}
{{- $filePrefix := replace "_" "-" $key }}
{{- $rootwrapFile := printf "/etc/neutron/rootwrap.d/%s.filters" $filePrefix }}
- name: neutron-etc
@@ -206,7 +187,6 @@ spec:
readOnly: true
{{- end }}
{{- end }}
- {{- end }}
- name: run
mountPath: /run
{{ if $mounts_neutron_ovs_agent.volumeMounts }}{{ toYaml $mounts_neutron_ovs_agent.volumeMounts | indent 12 }}{{ end }}
diff --git a/neutron/templates/daemonset-sriov-agent.yaml b/neutron/templates/daemonset-sriov-agent.yaml
index 4b8b6e1..6130817 100644
--- a/neutron/templates/daemonset-sriov-agent.yaml
+++ b/neutron/templates/daemonset-sriov-agent.yaml
@@ -85,12 +85,6 @@ spec:
mountPath: /etc/neutron/plugins/ml2/sriov_agent.ini
subPath: sriov_agent.ini
readOnly: true
- {{- if .Values.conf.plugins.taas.taas.enabled }}
- - name: neutron-etc
- mountPath: /etc/neutron/plugins/ml2/taas.ini
- subPath: taas.ini
- readOnly: true
- {{- end }}
- name: neutron-etc
# NOTE (Portdirect): We mount here to override Kollas
# custom sudoers file when using Kolla images, this
@@ -104,9 +98,6 @@ spec:
readOnly: true
{{- range $key, $value := $envAll.Values.conf.rootwrap_filters }}
{{- if ( has "sriov_agent" $value.pods ) }}
- {{- if and ( eq "taas" $key ) (not $envAll.Values.conf.plugins.taas.taas.enabled) }}
- ## if taas is not enabled, do not include taas.filters
- {{- else }}
{{- $filePrefix := replace "_" "-" $key }}
{{- $rootwrapFile := printf "/etc/neutron/rootwrap.d/%s.filters" $filePrefix }}
- name: neutron-etc
@@ -115,7 +106,6 @@ spec:
readOnly: true
{{- end }}
{{- end }}
- {{- end }}
- name: run
mountPath: /run
{{ if $mounts_neutron_sriov_agent.volumeMounts }}{{ toYaml $mounts_neutron_sriov_agent.volumeMounts | indent 12 }}{{ end }}
@@ -151,12 +141,6 @@ spec:
mountPath: /etc/neutron/plugins/ml2/sriov_agent.ini
subPath: sriov_agent.ini
readOnly: true
- {{- if .Values.conf.plugins.taas.taas.enabled }}
- - name: neutron-etc
- mountPath: /etc/neutron/plugins/ml2/taas.ini
- subPath: taas.ini
- readOnly: true
- {{- end }}
- name: neutron-etc
# NOTE (Portdirect): We mount here to override Kollas
# custom sudoers file when using Kolla images, this
@@ -170,9 +154,6 @@ spec:
readOnly: true
{{- range $key, $value := $envAll.Values.conf.rootwrap_filters }}
{{- if ( has "sriov_agent" $value.pods ) }}
- {{- if and ( eq "taas" $key ) (not $envAll.Values.conf.plugins.taas.taas.enabled) }}
- ## if taas is not enabled, do not include taas.filters
- {{- else }}
{{- $filePrefix := replace "_" "-" $key }}
{{- $rootwrapFile := printf "/etc/neutron/rootwrap.d/%s.filters" $filePrefix }}
- name: neutron-etc
@@ -181,7 +162,6 @@ spec:
readOnly: true
{{- end }}
{{- end }}
- {{- end }}
- name: run
mountPath: /run
{{ if $mounts_neutron_sriov_agent.volumeMounts }}{{ toYaml $mounts_neutron_sriov_agent.volumeMounts | indent 12 }}{{ end }}
diff --git a/neutron/templates/deployment-server.yaml b/neutron/templates/deployment-server.yaml
index b66467f..31dec3d 100644
--- a/neutron/templates/deployment-server.yaml
+++ b/neutron/templates/deployment-server.yaml
@@ -100,12 +100,6 @@ spec:
subPath: sriov_agent.ini
readOnly: true
{{ end }}
- {{- if .Values.conf.plugins.taas.taas.enabled }}
- - name: neutron-etc
- mountPath: /etc/neutron/taas_plugin.ini
- subPath: taas_plugin.ini
- readOnly: true
- {{ end }}
- name: neutron-etc
mountPath: /etc/neutron/api-paste.ini
subPath: api-paste.ini
diff --git a/neutron/values.yaml b/neutron/values.yaml
index 64201be..e5bb6d8 100644
--- a/neutron/values.yaml
+++ b/neutron/values.yaml
@@ -1433,23 +1433,6 @@ conf:
# NOTE: A second `--config-file` arg can also be added above. Since
# many neutron components are installed like that (eg: by devstack).
# Adjust to suit local requirements.
- taas:
- pods:
- - ovs_agent
- - sriov_agent
- content: |
- # neutron-rootwrap command filters for nodes on which neutron
- # tap-as-a-service(taas) is eanbled. Taas uses this command
- # as part of its flow control.
-
- # format seems to be
- # cmd-name: filter-name, raw-command, user, args
-
- [Filters]
-
- # This is needed to allow taas to insert/remove vlan id to the
- # target vf under /sys/class/net/[device-name]/device/sriov/[vf-index]/[mirror]
- i40e_sysfs_command: RegExpFilter, /opt/i40e_sysfs_command, root, /opt/i40e_sysfs_command, \w+, .+, .+
neutron:
DEFAULT:
log_config_append: /etc/neutron/logging.conf
@@ -1495,7 +1478,6 @@ conf:
keys:
- root
- neutron
- - neutron_taas
handlers:
keys:
- stdout
@@ -1513,11 +1495,6 @@ conf:
handlers:
- stdout
qualname: neutron
- logger_neutron_taas:
- level: INFO
- handlers:
- - stdout
- qualname: neutron_taas
logger_amqp:
level: WARNING
handlers: stderr
@@ -1573,12 +1550,7 @@ conf:
# using ml2_type_vlan.network_vlan_ranges:
# ml2_type_vlan:
# network_vlan_ranges: "external:1100:1110"
- agent:
- extensions: ""
ml2_conf_sriov: null
- taas:
- taas:
- enabled: False
openvswitch_agent:
agent:
tunnel_types: vxlan
--
1.8.3.1

59
openstack-helm/files/0003-ceilometer-chart-updates.patch → openstack-helm/files/0001-ceilometer-chart-updates.patch
View File

@ -1,7 +1,7 @@
From f45bfe9ea150965c011560b500ed6e01886bada3 Mon Sep 17 00:00:00 2001
From 194d712bafb63186850fb451185bdaaaa8054c23 Mon Sep 17 00:00:00 2001
From: Angie Wang <angie.wang@windriver.com>
Date: Fri, 19 Oct 2018 14:46:27 -0400
Subject: [PATCH 3/3] ceilometer chart updates
Subject: [PATCH 1/3] ceilometer chart updates
This commit includes the following changes:
- add polling process with ipmi function
@ -19,19 +19,19 @@ We need to rework a bit once the commit "Openstack: Use k8s secret to store conf
ceilometer/templates/bin/_ceilometer-ipmi.sh.tpl | 13 +
ceilometer/templates/bin/_db-sync.sh.tpl | 2 +-
ceilometer/templates/configmap-bin.yaml | 2 +
ceilometer/templates/configmap-etc.yaml | 8 +
ceilometer/templates/configmap-etc.yaml | 6 +
ceilometer/templates/daemonset-compute.yaml | 4 +
ceilometer/templates/daemonset-ipmi.yaml | 105 ++
ceilometer/templates/deployment-central.yaml | 4 +
ceilometer/templates/deployment-notification.yaml | 20 +
ceilometer/values.yaml | 1530 ++++++++++-----------
9 files changed, 902 insertions(+), 786 deletions(-)
ceilometer/values.yaml | 1532 ++++++++++-----------
9 files changed, 901 insertions(+), 787 deletions(-)
create mode 100644 ceilometer/templates/bin/_ceilometer-ipmi.sh.tpl
create mode 100644 ceilometer/templates/daemonset-ipmi.yaml
diff --git a/ceilometer/templates/bin/_ceilometer-ipmi.sh.tpl b/ceilometer/templates/bin/_ceilometer-ipmi.sh.tpl
new file mode 100644
index 0000000..ad280c3
index 00000000..ad280c30
--- /dev/null
+++ b/ceilometer/templates/bin/_ceilometer-ipmi.sh.tpl
@@ -0,0 +1,13 @@
@ -49,7 +49,7 @@ index 0000000..ad280c3
+ --polling-namespaces ipmi \
+ --config-file /etc/ceilometer/ceilometer.conf
diff --git a/ceilometer/templates/bin/_db-sync.sh.tpl b/ceilometer/templates/bin/_db-sync.sh.tpl
index 02f6f5d..ba7c1d8 100644
index 02f6f5d4..ba7c1d84 100644
--- a/ceilometer/templates/bin/_db-sync.sh.tpl
+++ b/ceilometer/templates/bin/_db-sync.sh.tpl
@@ -18,4 +18,4 @@ limitations under the License.
@ -59,7 +59,7 @@ index 02f6f5d..ba7c1d8 100644
-exec ceilometer-dbsync
+exec ceilometer-upgrade --skip-metering-database
diff --git a/ceilometer/templates/configmap-bin.yaml b/ceilometer/templates/configmap-bin.yaml
index 6c7d59a..558f24e 100644
index 6c7d59a9..558f24e7 100644
--- a/ceilometer/templates/configmap-bin.yaml
+++ b/ceilometer/templates/configmap-bin.yaml
@@ -53,6 +53,8 @@ data:
@ -72,7 +72,7 @@ index 6c7d59a..558f24e 100644
{{ tuple "bin/_ceilometer-notification.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
rabbit-init.sh: |
diff --git a/ceilometer/templates/configmap-etc.yaml b/ceilometer/templates/configmap-etc.yaml
index d7d9653..14105f5 100644
index 17ddb1b0..c48a3b8b 100644
--- a/ceilometer/templates/configmap-etc.yaml
+++ b/ceilometer/templates/configmap-etc.yaml
@@ -32,6 +32,10 @@ limitations under the License.
@ -86,18 +86,16 @@ index d7d9653..14105f5 100644
{{- if empty .Values.conf.ceilometer.database.connection -}}
{{- $_ := tuple "oslo_db" "internal" "ceilometer" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.ceilometer.database "connection" -}}
{{- end -}}
@@ -127,5 +131,9 @@ data:
{{ toYaml .Values.conf.event_definitions | indent 4 }}
gnocchi_resources.yaml: |
{{ toYaml .Values.conf.gnocchi_resources | indent 4 }}
+ meters.yaml: |
+{{ toYaml .Values.conf.meters | indent 4 }}
+ polling.yaml: |
+{{ toYaml .Values.conf.polling | indent 4 }}
{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.wsgi_ceilometer "key" "wsgi-ceilometer.conf" ) | indent 2 }}
@@ -120,5 +124,7 @@ data:
pipeline.yaml: {{ toYaml .Values.conf.pipeline | b64enc }}
event_definitions.yaml: {{ toYaml .Values.conf.event_definitions | b64enc }}
gnocchi_resources.yaml: {{ toYaml .Values.conf.gnocchi_resources | b64enc }}
+ meters.yaml: {{ toYaml .Values.conf.meters | b64enc }}
+ polling.yaml: {{ toYaml .Values.conf.polling | b64enc }}
{{ include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.wsgi_ceilometer "key" "wsgi-ceilometer.conf" "format" "Secret" ) | indent 2 }}
{{- end }}
diff --git a/ceilometer/templates/daemonset-compute.yaml b/ceilometer/templates/daemonset-compute.yaml
index cf31840..d2fd9ea 100644
index 686572af..bff2e15a 100644
--- a/ceilometer/templates/daemonset-compute.yaml
+++ b/ceilometer/templates/daemonset-compute.yaml
@@ -91,6 +91,10 @@ spec:
@ -113,7 +111,7 @@ index cf31840..d2fd9ea 100644
subPath: ceilometer-compute.sh
diff --git a/ceilometer/templates/daemonset-ipmi.yaml b/ceilometer/templates/daemonset-ipmi.yaml
new file mode 100644
index 0000000..9a7d72b
index 00000000..9a7d72bf
--- /dev/null
+++ b/ceilometer/templates/daemonset-ipmi.yaml
@@ -0,0 +1,105 @@
@ -223,7 +221,7 @@ index 0000000..9a7d72b
+{{ if $mounts_ceilometer_ipmi.volumes }}{{ toYaml $mounts_ceilometer_ipmi.volumes | indent 8 }}{{ end }}
+{{- end }}
diff --git a/ceilometer/templates/deployment-central.yaml b/ceilometer/templates/deployment-central.yaml
index 2fe7ed3..06121f2 100644
index b7a597bf..7a6cd2b6 100644
--- a/ceilometer/templates/deployment-central.yaml
+++ b/ceilometer/templates/deployment-central.yaml
@@ -89,6 +89,10 @@ spec:
@ -238,7 +236,7 @@ index 2fe7ed3..06121f2 100644
mountPath: /tmp/ceilometer-central.sh
subPath: ceilometer-central.sh
diff --git a/ceilometer/templates/deployment-notification.yaml b/ceilometer/templates/deployment-notification.yaml
index 2eeb571..f61c5e8 100644
index 06fda3df..cb528ca9 100644
--- a/ceilometer/templates/deployment-notification.yaml
+++ b/ceilometer/templates/deployment-notification.yaml
@@ -89,14 +89,30 @@ spec:
@ -270,8 +268,8 @@ index 2eeb571..f61c5e8 100644
+ - name: etcpanko
+ emptyDir: {}
- name: ceilometer-etc
configMap:
name: ceilometer-etc
secret:
secretName: ceilometer-etc
@@ -105,5 +121,9 @@ spec:
configMap:
name: ceilometer-bin
@ -283,7 +281,7 @@ index 2eeb571..f61c5e8 100644
{{ if $mounts_ceilometer_notification.volumes }}{{ toYaml $mounts_ceilometer_notification.volumes | indent 8 }}{{ end }}
{{- end }}
diff --git a/ceilometer/values.yaml b/ceilometer/values.yaml
index 4e7f104..54d1e5a 100644
index 50219679..5908a4ec 100644
--- a/ceilometer/values.yaml
+++ b/ceilometer/values.yaml
@@ -29,6 +29,9 @@ labels:
@ -1284,9 +1282,7 @@ index 4e7f104..54d1e5a 100644
- fields: payload.serial
- status:
- fields: payload.status
+ email:
+ fields: payload.email
ttl:
- ttl:
- fields: payload.ttl
- updated_at:
- fields: payload.updated_at
@ -1422,6 +1418,9 @@ index 4e7f104..54d1e5a 100644
- traits:
- availability_zone:
- fields: payload.availability_zone
+ email:
+ fields: payload.email
+ ttl:
+ fields: payload.ttl
+ action:
+ fields: payload.action
@ -2100,7 +2099,7 @@ index 4e7f104..54d1e5a 100644
jobs:
db_init:
requests:
@@ -2068,6 +2027,7 @@ manifests:
@@ -2073,6 +2032,7 @@ manifests:
deployment_central: true
deployment_collector: true
daemonset_compute: true
@ -2109,5 +2108,5 @@ index 4e7f104..54d1e5a 100644
ingress_api: true
job_bootstrap: true
--
1.8.3.1
2.16.5

76
openstack-helm/files/0004-Add-Aodh-Chart.patch → openstack-helm/files/0002-Add-Aodh-Chart.patch
View File

@ -1,7 +1,7 @@
From aeed59c1ca49950c7ba667a5f9b44ec552b63f5f Mon Sep 17 00:00:00 2001
From 8615d16af10e1d14dedeb9a026e59491142c0dbf Mon Sep 17 00:00:00 2001
From: Angie Wang <angie.wang@windriver.com>
Date: Wed, 14 Nov 2018 11:39:55 -0500
Subject: [PATCH 1/1] Add Aodh Chart
Subject: [PATCH 2/3] Add Aodh Chart
This commit adds a helm chart to deloy Aodh.
@ -82,7 +82,7 @@ https://review.openstack.org/#/c/468530/
diff --git a/aodh/Chart.yaml b/aodh/Chart.yaml
new file mode 100644
index 0000000..6f666f0
index 00000000..6f666f0e
--- /dev/null
+++ b/aodh/Chart.yaml
@@ -0,0 +1,24 @@
@ -112,7 +112,7 @@ index 0000000..6f666f0
+ - name: OpenStack-Helm Authors
diff --git a/aodh/requirements.yaml b/aodh/requirements.yaml
new file mode 100644
index 0000000..53782e6
index 00000000..53782e69
--- /dev/null
+++ b/aodh/requirements.yaml
@@ -0,0 +1,18 @@
@ -136,7 +136,7 @@ index 0000000..53782e6
+ version: 0.1.0
diff --git a/aodh/templates/bin/_aodh-alarms-cleaner.sh.tpl b/aodh/templates/bin/_aodh-alarms-cleaner.sh.tpl
new file mode 100644
index 0000000..8ca0e7c
index 00000000..8ca0e7c5
--- /dev/null
+++ b/aodh/templates/bin/_aodh-alarms-cleaner.sh.tpl
@@ -0,0 +1,21 @@
@ -163,7 +163,7 @@ index 0000000..8ca0e7c
+aodh-expirer
diff --git a/aodh/templates/bin/_aodh-api.sh.tpl b/aodh/templates/bin/_aodh-api.sh.tpl
new file mode 100644
index 0000000..708b327
index 00000000..708b3272
--- /dev/null
+++ b/aodh/templates/bin/_aodh-api.sh.tpl
@@ -0,0 +1,39 @@
@ -208,7 +208,7 @@ index 0000000..708b327
+$COMMAND
diff --git a/aodh/templates/bin/_aodh-evaluator.sh.tpl b/aodh/templates/bin/_aodh-evaluator.sh.tpl
new file mode 100644
index 0000000..7c7b07b
index 00000000..7c7b07b0
--- /dev/null
+++ b/aodh/templates/bin/_aodh-evaluator.sh.tpl
@@ -0,0 +1,21 @@
@ -235,7 +235,7 @@ index 0000000..7c7b07b
+exec aodh-evaluator --config-file=/etc/aodh/aodh.conf
diff --git a/aodh/templates/bin/_aodh-listener.sh.tpl b/aodh/templates/bin/_aodh-listener.sh.tpl
new file mode 100644
index 0000000..0abeba4
index 00000000..0abeba43
--- /dev/null
+++ b/aodh/templates/bin/_aodh-listener.sh.tpl
@@ -0,0 +1,21 @@
@ -262,7 +262,7 @@ index 0000000..0abeba4
+exec aodh-listener --config-file=/etc/aodh/aodh.conf
diff --git a/aodh/templates/bin/_aodh-notifier.sh.tpl b/aodh/templates/bin/_aodh-notifier.sh.tpl
new file mode 100644
index 0000000..b1b4f94
index 00000000..b1b4f947
--- /dev/null
+++ b/aodh/templates/bin/_aodh-notifier.sh.tpl
@@ -0,0 +1,21 @@
@ -289,7 +289,7 @@ index 0000000..b1b4f94
+exec aodh-notifier --config-file=/etc/aodh/aodh.conf
diff --git a/aodh/templates/bin/_aodh-test.sh.tpl b/aodh/templates/bin/_aodh-test.sh.tpl
new file mode 100644
index 0000000..fc95b06
index 00000000..fc95b06c
--- /dev/null
+++ b/aodh/templates/bin/_aodh-test.sh.tpl
@@ -0,0 +1,54 @@
@ -349,7 +349,7 @@ index 0000000..fc95b06
+
diff --git a/aodh/templates/bin/_bootstrap.sh.tpl b/aodh/templates/bin/_bootstrap.sh.tpl
new file mode 100644
index 0000000..533c0a5
index 00000000..533c0a5a
--- /dev/null
+++ b/aodh/templates/bin/_bootstrap.sh.tpl
@@ -0,0 +1,20 @@
@ -375,7 +375,7 @@ index 0000000..533c0a5
+{{ .Values.bootstrap.script | default "echo 'Not Enabled'" }}
diff --git a/aodh/templates/bin/_db-sync.sh.tpl b/aodh/templates/bin/_db-sync.sh.tpl
new file mode 100644
index 0000000..7eb7bd3
index 00000000..7eb7bd3f
--- /dev/null
+++ b/aodh/templates/bin/_db-sync.sh.tpl
@@ -0,0 +1,21 @@
@ -402,7 +402,7 @@ index 0000000..7eb7bd3
+aodh-dbsync
diff --git a/aodh/templates/configmap-bin.yaml b/aodh/templates/configmap-bin.yaml
new file mode 100644
index 0000000..3ee32e7
index 00000000..3ee32e79
--- /dev/null
+++ b/aodh/templates/configmap-bin.yaml
@@ -0,0 +1,60 @@
@ -468,7 +468,7 @@ index 0000000..3ee32e7
+{{- end }}
diff --git a/aodh/templates/configmap-etc.yaml b/aodh/templates/configmap-etc.yaml
new file mode 100644
index 0000000..81f4e1f
index 00000000..81f4e1fb
--- /dev/null
+++ b/aodh/templates/configmap-etc.yaml
@@ -0,0 +1,123 @@
@ -598,7 +598,7 @@ index 0000000..81f4e1f
\ No newline at end of file
diff --git a/aodh/templates/cron-job-alarms-cleaner.yaml b/aodh/templates/cron-job-alarms-cleaner.yaml
new file mode 100644
index 0000000..6862c5f
index 00000000..6862c5f3
--- /dev/null
+++ b/aodh/templates/cron-job-alarms-cleaner.yaml
@@ -0,0 +1,84 @@
@ -688,7 +688,7 @@ index 0000000..6862c5f
+{{- end }}
diff --git a/aodh/templates/deployment-api.yaml b/aodh/templates/deployment-api.yaml
new file mode 100644
index 0000000..6190261
index 00000000..61902610
--- /dev/null
+++ b/aodh/templates/deployment-api.yaml
@@ -0,0 +1,121 @@
@ -816,7 +816,7 @@ index 0000000..6190261
\ No newline at end of file
diff --git a/aodh/templates/deployment-evaluator.yaml b/aodh/templates/deployment-evaluator.yaml
new file mode 100644
index 0000000..175f142
index 00000000..175f1421
--- /dev/null
+++ b/aodh/templates/deployment-evaluator.yaml
@@ -0,0 +1,101 @@
@ -923,7 +923,7 @@ index 0000000..175f142
+{{- end }}
diff --git a/aodh/templates/deployment-listener.yaml b/aodh/templates/deployment-listener.yaml
new file mode 100644
index 0000000..ca1dc19
index 00000000..ca1dc191
--- /dev/null
+++ b/aodh/templates/deployment-listener.yaml
@@ -0,0 +1,102 @@
@ -1031,7 +1031,7 @@ index 0000000..ca1dc19
+
diff --git a/aodh/templates/deployment-notifier.yaml b/aodh/templates/deployment-notifier.yaml
new file mode 100644
index 0000000..068d83a
index 00000000..068d83a9
--- /dev/null
+++ b/aodh/templates/deployment-notifier.yaml
@@ -0,0 +1,103 @@
@ -1140,7 +1140,7 @@ index 0000000..068d83a
+
diff --git a/aodh/templates/ingress-api.yaml b/aodh/templates/ingress-api.yaml
new file mode 100644
index 0000000..fe3f31c
index 00000000..fe3f31c4
--- /dev/null
+++ b/aodh/templates/ingress-api.yaml
@@ -0,0 +1,20 @@
@ -1166,7 +1166,7 @@ index 0000000..fe3f31c
+{{- end }}
diff --git a/aodh/templates/job-bootstrap.yaml b/aodh/templates/job-bootstrap.yaml
new file mode 100644
index 0000000..17cea12
index 00000000..17cea12b
--- /dev/null
+++ b/aodh/templates/job-bootstrap.yaml
@@ -0,0 +1,20 @@
@ -1192,7 +1192,7 @@ index 0000000..17cea12
+{{- end }}
diff --git a/aodh/templates/job-db-drop.yaml b/aodh/templates/job-db-drop.yaml
new file mode 100644
index 0000000..8c2d80c
index 00000000..8c2d80c3
--- /dev/null
+++ b/aodh/templates/job-db-drop.yaml
@@ -0,0 +1,20 @@
@ -1219,7 +1219,7 @@ index 0000000..8c2d80c
\ No newline at end of file
diff --git a/aodh/templates/job-db-init.yaml b/aodh/templates/job-db-init.yaml
new file mode 100644
index 0000000..5d14fb7
index 00000000..5d14fb75
--- /dev/null
+++ b/aodh/templates/job-db-init.yaml
@@ -0,0 +1,20 @@
@ -1245,7 +1245,7 @@ index 0000000..5d14fb7
+{{- end }}
diff --git a/aodh/templates/job-db-sync.yaml b/aodh/templates/job-db-sync.yaml
new file mode 100644
index 0000000..2428c7f
index 00000000..2428c7f2
--- /dev/null
+++ b/aodh/templates/job-db-sync.yaml
@@ -0,0 +1,20 @@
@ -1271,7 +1271,7 @@ index 0000000..2428c7f
+{{- end }}
diff --git a/aodh/templates/job-image-repo-sync.yaml b/aodh/templates/job-image-repo-sync.yaml
new file mode 100644
index 0000000..0eeef1e
index 00000000..0eeef1ed
--- /dev/null
+++ b/aodh/templates/job-image-repo-sync.yaml
@@ -0,0 +1,20 @@
@ -1297,7 +1297,7 @@ index 0000000..0eeef1e
+{{- end }}
diff --git a/aodh/templates/job-ks-endpoints.yaml b/aodh/templates/job-ks-endpoints.yaml
new file mode 100644
index 0000000..7fc30c2
index 00000000..7fc30c2b
--- /dev/null
+++ b/aodh/templates/job-ks-endpoints.yaml
@@ -0,0 +1,20 @@
@ -1323,7 +1323,7 @@ index 0000000..7fc30c2
+{{- end }}
diff --git a/aodh/templates/job-ks-service.yaml b/aodh/templates/job-ks-service.yaml
new file mode 100644
index 0000000..b4120b3
index 00000000..b4120b3c
--- /dev/null
+++ b/aodh/templates/job-ks-service.yaml
@@ -0,0 +1,20 @@
@ -1349,7 +1349,7 @@ index 0000000..b4120b3
+{{- end }}
diff --git a/aodh/templates/job-ks-user.yaml b/aodh/templates/job-ks-user.yaml
new file mode 100644
index 0000000..9618931
index 00000000..96189310
--- /dev/null
+++ b/aodh/templates/job-ks-user.yaml
@@ -0,0 +1,20 @@
@ -1375,7 +1375,7 @@ index 0000000..9618931
+{{- end }}
diff --git a/aodh/templates/job-rabbit-init.yaml b/aodh/templates/job-rabbit-init.yaml
new file mode 100644
index 0000000..06cc5a7
index 00000000..06cc5a71
--- /dev/null
+++ b/aodh/templates/job-rabbit-init.yaml
@@ -0,0 +1,20 @@
@ -1401,7 +1401,7 @@ index 0000000..06cc5a7
+{{- end }}
diff --git a/aodh/templates/pdb-api.yaml b/aodh/templates/pdb-api.yaml
new file mode 100644
index 0000000..1892708
index 00000000..1892708e
--- /dev/null
+++ b/aodh/templates/pdb-api.yaml
@@ -0,0 +1,29 @@
@ -1436,7 +1436,7 @@ index 0000000..1892708
+{{- end }}
diff --git a/aodh/templates/pod-aodh-test.yaml b/aodh/templates/pod-aodh-test.yaml
new file mode 100644
index 0000000..9254c92
index 00000000..9254c922
--- /dev/null
+++ b/aodh/templates/pod-aodh-test.yaml
@@ -0,0 +1,72 @@
@ -1514,7 +1514,7 @@ index 0000000..9254c92
+{{- end }}
diff --git a/aodh/templates/secret-db.yaml b/aodh/templates/secret-db.yaml
new file mode 100644
index 0000000..85568c1
index 00000000..85568c1a
--- /dev/null
+++ b/aodh/templates/secret-db.yaml
@@ -0,0 +1,30 @@
@ -1551,7 +1551,7 @@ index 0000000..85568c1
\ No newline at end of file
diff --git a/aodh/templates/secret-keystone.yaml b/aodh/templates/secret-keystone.yaml
new file mode 100644
index 0000000..aef25b2
index 00000000..aef25b2e
--- /dev/null
+++ b/aodh/templates/secret-keystone.yaml
@@ -0,0 +1,30 @@
@ -1587,7 +1587,7 @@ index 0000000..aef25b2
+{{- end }}
diff --git a/aodh/templates/secret-rabbitmq.yaml b/aodh/templates/secret-rabbitmq.yaml
new file mode 100644
index 0000000..ad65ae3
index 00000000..ad65ae34
--- /dev/null
+++ b/aodh/templates/secret-rabbitmq.yaml
@@ -0,0 +1,30 @@
@ -1623,7 +1623,7 @@ index 0000000..ad65ae3
+{{- end }}
diff --git a/aodh/templates/service-api.yaml b/aodh/templates/service-api.yaml
new file mode 100644
index 0000000..bb9083e
index 00000000..bb9083ef
--- /dev/null
+++ b/aodh/templates/service-api.yaml
@@ -0,0 +1,39 @@
@ -1668,7 +1668,7 @@ index 0000000..bb9083e
+{{- end }}
diff --git a/aodh/templates/service-ingress-api.yaml b/aodh/templates/service-ingress-api.yaml
new file mode 100644
index 0000000..c1b9658
index 00000000..c1b96584
--- /dev/null
+++ b/aodh/templates/service-ingress-api.yaml
@@ -0,0 +1,20 @@
@ -1694,7 +1694,7 @@ index 0000000..c1b9658
+{{- end }}
diff --git a/aodh/values.yaml b/aodh/values.yaml
new file mode 100644
index 0000000..bd7a736
index 00000000..bd7a736f
--- /dev/null
+++ b/aodh/values.yaml
@@ -0,0 +1,671 @@
@ -2370,5 +2370,5 @@ index 0000000..bd7a736
+ service_ingress_api: true
+
--
1.8.3.1
2.16.5

1811
openstack-helm/files/0002-Revert-Openstack-Use-k8s-secret-to-store-config.patch
View File

File diff suppressed because it is too large Load Diff

60
openstack-helm/files/0005-Add-Panko-Chart.patch → openstack-helm/files/0003-Add-Panko-Chart.patch
View File

@ -1,7 +1,7 @@
From 37fd9663c087532e35d3e514d91b29994022abfa Mon Sep 17 00:00:00 2001
From e52f311273dd9674cde764cf8f1c3bc02e8d0e00 Mon Sep 17 00:00:00 2001
From: Angie Wang <angie.wang@windriver.com>
Date: Wed, 14 Nov 2018 11:58:17 -0500
Subject: [PATCH 1/1] Add Panko Chart
Subject: [PATCH 3/3] Add Panko Chart
This commit adds a helm chart to deploy Panko.
@ -66,7 +66,7 @@ https://review.openstack.org/#/c/469180/
diff --git a/panko/Chart.yaml b/panko/Chart.yaml
new file mode 100755
index 0000000..7c5842a
index 00000000..7c5842ac
--- /dev/null
+++ b/panko/Chart.yaml
@@ -0,0 +1,24 @@
@ -96,7 +96,7 @@ index 0000000..7c5842a
+ - name: OpenStack-Helm Authors
diff --git a/panko/requirements.yaml b/panko/requirements.yaml
new file mode 100755
index 0000000..53782e6
index 00000000..53782e69
--- /dev/null
+++ b/panko/requirements.yaml
@@ -0,0 +1,18 @@
@ -120,7 +120,7 @@ index 0000000..53782e6
+ version: 0.1.0
diff --git a/panko/templates/bin/_bootstrap.sh.tpl b/panko/templates/bin/_bootstrap.sh.tpl
new file mode 100755
index 0000000..81a93b4
index 00000000..81a93b42
--- /dev/null
+++ b/panko/templates/bin/_bootstrap.sh.tpl
@@ -0,0 +1,20 @@
@ -147,7 +147,7 @@ index 0000000..81a93b4
\ No newline at end of file
diff --git a/panko/templates/bin/_db-sync.sh.tpl b/panko/templates/bin/_db-sync.sh.tpl
new file mode 100755
index 0000000..8ca583a
index 00000000..8ca583a9
--- /dev/null
+++ b/panko/templates/bin/_db-sync.sh.tpl
@@ -0,0 +1,21 @@
@ -174,7 +174,7 @@ index 0000000..8ca583a
+exec panko-dbsync
diff --git a/panko/templates/bin/_panko-api.sh.tpl b/panko/templates/bin/_panko-api.sh.tpl
new file mode 100755
index 0000000..bd08a43
index 00000000..bd08a438
--- /dev/null
+++ b/panko/templates/bin/_panko-api.sh.tpl
@@ -0,0 +1,40 @@
@ -220,7 +220,7 @@ index 0000000..bd08a43
+
diff --git a/panko/templates/bin/_panko-events-cleaner.sh.tpl b/panko/templates/bin/_panko-events-cleaner.sh.tpl
new file mode 100755
index 0000000..10f3a86
index 00000000..10f3a863
--- /dev/null
+++ b/panko/templates/bin/_panko-events-cleaner.sh.tpl
@@ -0,0 +1,21 @@
@ -247,7 +247,7 @@ index 0000000..10f3a86
+panko-expirer
diff --git a/panko/templates/bin/_panko-test.sh.tpl b/panko/templates/bin/_panko-test.sh.tpl
new file mode 100755
index 0000000..28273f9
index 00000000..28273f9f
--- /dev/null
+++ b/panko/templates/bin/_panko-test.sh.tpl
@@ -0,0 +1,29 @@
@ -282,7 +282,7 @@ index 0000000..28273f9
+exit 0
diff --git a/panko/templates/configmap-bin.yaml b/panko/templates/configmap-bin.yaml
new file mode 100755
index 0000000..2eb73f4
index 00000000..2eb73f48
--- /dev/null
+++ b/panko/templates/configmap-bin.yaml
@@ -0,0 +1,51 @@
@ -339,7 +339,7 @@ index 0000000..2eb73f4
+{{- end }}
diff --git a/panko/templates/configmap-etc.yaml b/panko/templates/configmap-etc.yaml
new file mode 100755
index 0000000..f2d02c8
index 00000000..f2d02c8c
--- /dev/null
+++ b/panko/templates/configmap-etc.yaml
@@ -0,0 +1,91 @@
@ -436,7 +436,7 @@ index 0000000..f2d02c8
+{{- end }}
diff --git a/panko/templates/cron-job-events-cleaner.yaml b/panko/templates/cron-job-events-cleaner.yaml
new file mode 100755
index 0000000..b0794b5
index 00000000..b0794b50
--- /dev/null
+++ b/panko/templates/cron-job-events-cleaner.yaml
@@ -0,0 +1,84 @@
@ -526,7 +526,7 @@ index 0000000..b0794b5
+{{- end }}
diff --git a/panko/templates/deployment-api.yaml b/panko/templates/deployment-api.yaml
new file mode 100755
index 0000000..93c3ada
index 00000000..93c3ada2
--- /dev/null
+++ b/panko/templates/deployment-api.yaml
@@ -0,0 +1,121 @@
@ -653,7 +653,7 @@ index 0000000..93c3ada
+{{- end }}
diff --git a/panko/templates/ingress-api.yaml b/panko/templates/ingress-api.yaml
new file mode 100755
index 0000000..d6d0e88
index 00000000..d6d0e88a
--- /dev/null
+++ b/panko/templates/ingress-api.yaml
@@ -0,0 +1,20 @@
@ -679,7 +679,7 @@ index 0000000..d6d0e88
+{{- end }}
diff --git a/panko/templates/job-bootstrap.yaml b/panko/templates/job-bootstrap.yaml
new file mode 100755
index 0000000..7321d4b
index 00000000..7321d4ba
--- /dev/null
+++ b/panko/templates/job-bootstrap.yaml
@@ -0,0 +1,20 @@
@ -705,7 +705,7 @@ index 0000000..7321d4b
+{{- end }}
diff --git a/panko/templates/job-db-drop.yaml b/panko/templates/job-db-drop.yaml
new file mode 100755
index 0000000..7e50dbe
index 00000000..7e50dbe0
--- /dev/null
+++ b/panko/templates/job-db-drop.yaml
@@ -0,0 +1,20 @@
@ -732,7 +732,7 @@ index 0000000..7e50dbe
\ No newline at end of file
diff --git a/panko/templates/job-db-init.yaml b/panko/templates/job-db-init.yaml
new file mode 100755
index 0000000..22f4ddb
index 00000000..22f4ddb6
--- /dev/null
+++ b/panko/templates/job-db-init.yaml
@@ -0,0 +1,20 @@
@ -759,7 +759,7 @@ index 0000000..22f4ddb
\ No newline at end of file
diff --git a/panko/templates/job-db-sync.yaml b/panko/templates/job-db-sync.yaml
new file mode 100755
index 0000000..4b2fe73
index 00000000..4b2fe735
--- /dev/null
+++ b/panko/templates/job-db-sync.yaml
@@ -0,0 +1,20 @@
@ -786,7 +786,7 @@ index 0000000..4b2fe73
\ No newline at end of file
diff --git a/panko/templates/job-image-repo-sync.yaml b/panko/templates/job-image-repo-sync.yaml
new file mode 100755
index 0000000..8faed5b
index 00000000..8faed5ba
--- /dev/null
+++ b/panko/templates/job-image-repo-sync.yaml
@@ -0,0 +1,20 @@
@ -813,7 +813,7 @@ index 0000000..8faed5b
\ No newline at end of file
diff --git a/panko/templates/job-ks-endpoints.yaml b/panko/templates/job-ks-endpoints.yaml
new file mode 100755
index 0000000..77457ba
index 00000000..77457ba6
--- /dev/null
+++ b/panko/templates/job-ks-endpoints.yaml
@@ -0,0 +1,20 @@
@ -840,7 +840,7 @@ index 0000000..77457ba
\ No newline at end of file
diff --git a/panko/templates/job-ks-service.yaml b/panko/templates/job-ks-service.yaml
new file mode 100755
index 0000000..1531564
index 00000000..15315648
--- /dev/null
+++ b/panko/templates/job-ks-service.yaml
@@ -0,0 +1,20 @@
@ -867,7 +867,7 @@ index 0000000..1531564
\ No newline at end of file
diff --git a/panko/templates/job-ks-user.yaml b/panko/templates/job-ks-user.yaml
new file mode 100755
index 0000000..bff96ed
index 00000000..bff96ed6
--- /dev/null
+++ b/panko/templates/job-ks-user.yaml
@@ -0,0 +1,20 @@
@ -894,7 +894,7 @@ index 0000000..bff96ed
\ No newline at end of file
diff --git a/panko/templates/pdb-api.yaml b/panko/templates/pdb-api.yaml
new file mode 100755
index 0000000..fc6fcd0
index 00000000..fc6fcd0e
--- /dev/null
+++ b/panko/templates/pdb-api.yaml
@@ -0,0 +1,29 @@
@ -929,7 +929,7 @@ index 0000000..fc6fcd0
+{{- end }}
diff --git a/panko/templates/pod-panko-test.yaml b/panko/templates/pod-panko-test.yaml
new file mode 100755
index 0000000..2acc43a
index 00000000..2acc43a2
--- /dev/null
+++ b/panko/templates/pod-panko-test.yaml
@@ -0,0 +1,72 @@
@ -1007,7 +1007,7 @@ index 0000000..2acc43a
+{{- end }}
diff --git a/panko/templates/secret-db.yaml b/panko/templates/secret-db.yaml
new file mode 100755
index 0000000..58edac4
index 00000000..58edac4c
--- /dev/null
+++ b/panko/templates/secret-db.yaml
@@ -0,0 +1,30 @@
@ -1044,7 +1044,7 @@ index 0000000..58edac4
\ No newline at end of file
diff --git a/panko/templates/secret-keystone.yaml b/panko/templates/secret-keystone.yaml
new file mode 100755
index 0000000..9b44ceb
index 00000000..9b44ceb2
--- /dev/null
+++ b/panko/templates/secret-keystone.yaml
@@ -0,0 +1,30 @@
@ -1080,7 +1080,7 @@ index 0000000..9b44ceb
+{{- end }}
diff --git a/panko/templates/service-api.yaml b/panko/templates/service-api.yaml
new file mode 100755
index 0000000..893d9e3
index 00000000..893d9e3d
--- /dev/null
+++ b/panko/templates/service-api.yaml
@@ -0,0 +1,39 @@
@ -1125,7 +1125,7 @@ index 0000000..893d9e3
+{{- end }}
diff --git a/panko/templates/service-ingress-api.yaml b/panko/templates/service-ingress-api.yaml
new file mode 100755
index 0000000..422e74d
index 00000000..422e74dd
--- /dev/null
+++ b/panko/templates/service-ingress-api.yaml
@@ -0,0 +1,20 @@
@ -1152,7 +1152,7 @@ index 0000000..422e74d
\ No newline at end of file
diff --git a/panko/values.yaml b/panko/values.yaml
new file mode 100755
index 0000000..a206a31
index 00000000..a206a31b
--- /dev/null
+++ b/panko/values.yaml
@@ -0,0 +1,535 @@
@ -1692,5 +1692,5 @@ index 0000000..a206a31
+ service_ingress_api: true
+
--
1.8.3.1
2.16.5