starlingx/openstack-armada-app
Code Issues Proposed changes

Adding openstack-helm and openstack-helm-infra to the build

Browse Source 
There are 3 patches for openstack-helm-infra based on
 upstream SHA 5ec85a5d70fab468160d2fdafed1a2a7a5151405

There are 3 patches for openstack-helm based on
 upstream SHA add7a9bc1175f6fafa8ea2918bc1d62209aaf243

Those patches will be removed as the commits are squashed
and merged by the containerization team.

Story: 2003909
Task: 27632
Depends-On: I5c761b9261e72783f1771492d653e641193f7c52
Depends-On: I57c5ec5f3565e9e585f0935af745e495699aa28c
Change-Id: I566f5f841397195024db7c636c1db2be7b2c8f4d
Signed-off-by: Al Bailey <Al.Bailey@windriver.com>
This commit is contained in:
Al Bailey 2018-10-19 12:30:40 -05:00
parent 09fab5a0ed
commit a0d06c3ac2
12 changed files with 4746 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openstack-helm-infra/Readme.rst Normal file
View File

@ -0,0 +1,8 @@
This repo is for https://github.com/openstack/openstack-helm-infra
Changes to this repo are needed for StarlingX and those changes are
not yet merged.
Rather than clone and diverge the repo, the repo is extracted at a particular
git SHA, and patches are applied on top.
As those patches are merged, the SHA can be updated and the local patches removed.

8
openstack-helm-infra/centos/build_srpm.data Normal file
View File

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

58
openstack-helm-infra/centos/openstack-helm-infra.spec Normal file
View File

@ -0,0 +1,58 @@
%global sha 5ec85a5d70fab468160d2fdafed1a2a7a5151405
%global helm_folder /usr/lib/helm
Summary: Openstack-Helm-Infra charts
Name: openstack-helm-infra
Version: 1.0
Release: %{tis_patch_ver}%{?_tis_dist}
License: Apache-2.0
Group: base
Packager: Wind River <info@windriver.com>
URL: https://github.com/openstack/openstack-helm-infra
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
%description
Openstack Helm Infra charts
%prep
%setup -n openstack-helm-infra
%patch01 -p1
%patch02 -p1
%patch03 -p1
%build
# initialize helm and build the toolkit
helm init --client-only
make helm-toolkit
# Host a server for the charts
helm serve /tmp/charts --address localhost:8879 --url http://localhost:8879/charts &
helm repo rm local
helm repo add local http://localhost:8879/charts
# Make the charts. These produce tgz files
make gnocchi
make ingress
make libvirt
make mariadb
make memcached
make openvswitch
make rabbitmq
%install
install -d -m 755 ${RPM_BUILD_ROOT}%{helm_folder}
install -p -D -m 755 *.tgz ${RPM_BUILD_ROOT}%{helm_folder}
%files
%dir %attr(0755,root,root) %{helm_folder}
%defattr(-,root,root,-)
%{helm_folder}/*

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

@ -0,0 +1,44 @@
From 5d78a8df854340225c32d025e921efd5c9dc2be1 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
coordination_url
- Remove the gnocchi upgrade option "--create-legacy-resource-types" as
it is deprecated since gnocchi 4.0.0
- Set the default coordination driver of gnocchi to memcached
---
gnocchi/templates/bin/_db-sync.sh.tpl | 2 +-
gnocchi/templates/configmap-etc.yaml | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/gnocchi/templates/bin/_db-sync.sh.tpl b/gnocchi/templates/bin/_db-sync.sh.tpl
index a32db4e..0693ee2 100644
--- a/gnocchi/templates/bin/_db-sync.sh.tpl
+++ b/gnocchi/templates/bin/_db-sync.sh.tpl
@@ -18,4 +18,4 @@ limitations under the License.
set -ex
-exec gnocchi-upgrade --create-legacy-resource-types
+exec gnocchi-upgrade
diff --git a/gnocchi/templates/configmap-etc.yaml b/gnocchi/templates/configmap-etc.yaml
index 83d3f14..bdf6acc 100644
--- a/gnocchi/templates/configmap-etc.yaml
+++ b/gnocchi/templates/configmap-etc.yaml
@@ -50,6 +50,12 @@ limitations under the License.
{{- $_ := set .Values.conf.gnocchi.keystone_authtoken "password" .Values.endpoints.identity.auth.gnocchi.password -}}
{{- end -}}
+{{- if empty .Values.conf.gnocchi.DEFAULT.coordination_url -}}
+{{- $endpointUrl := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }}
+{{- $driver := .Values.endpoints.oslo_cache.hosts.default -}}
+{{- $_ := printf "%s://%s" $driver $endpointUrl | set .Values.conf.gnocchi.DEFAULT "coordination_url" -}}
+{{- end -}}
+
{{- if empty .Values.conf.gnocchi.database.connection -}}
{{- $_ := 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

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

@ -0,0 +1,140 @@
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 Normal file
View File

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

8
openstack-helm/Readme.rst Normal file
View File

@ -0,0 +1,8 @@
This repo is for https://github.com/openstack/openstack-helm
Changes to this repo are needed for StarlingX and those changes are
not yet merged.
Rather than clone and diverge the repo, the repo is extracted at a particular
git SHA, and patches are applied on top.
As those patches are merged, the SHA can be updated and the local patches removed.

8
openstack-helm/centos/build_srpm.data Normal file
View File

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

70
openstack-helm/centos/openstack-helm.spec Normal file
View File

@ -0,0 +1,70 @@
%global sha add7a9bc1175f6fafa8ea2918bc1d62209aaf243
%global helm_folder /usr/lib/helm
%global toolkit_version 0.1.0
%global helmchart_version 0.1.0
Summary: Openstack-Helm charts
Name: openstack-helm
Version: 1.0
Release: %{tis_patch_ver}%{?_tis_dist}
License: Apache-2.0
Group: base
Packager: Wind River <info@windriver.com>
URL: https://github.com/openstack/openstack-helm
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
BuildRequires: helm
BuildRequires: openstack-helm-infra
Requires: openstack-helm-infra
%description
Openstack Helm charts
%prep
%setup -n openstack-helm
%patch01 -p1
%patch02 -p1
%patch03 -p1
%build
# initialize helm and stage the toolkit
helm init --client-only
# Host a server for the charts
cp %{helm_folder}/helm-toolkit-%{toolkit_version}.tgz .
helm serve --repo-path . &
helm repo rm local
helm repo add local http://localhost:8879/charts
# Make the charts. These produce a tgz file
make barbican
make ceilometer
make cinder
make glance
make heat
make horizon
make ironic
make keystone
make magnum
make neutron
make nova
# Remove the helm-toolkit tarball
rm helm-toolkit-%{toolkit_version}.tgz
%install
# helm_folder is created by openstack-helm-infra
install -d -m 755 ${RPM_BUILD_ROOT}%{helm_folder}
install -p -D -m 755 *.tgz ${RPM_BUILD_ROOT}%{helm_folder}
%files
#helm_folder is owned by openstack-helm-infra
%defattr(-,root,root,-)
%{helm_folder}/*

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

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

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

File diff suppressed because it is too large Load Diff

2113
openstack-helm/files/0003-ceilometer-chart-updates.patch Normal file
View File

File diff suppressed because it is too large Load Diff