starlingx/upstream
Code Issues Proposed changes

Merge "openstack-helm-infra remove Ceph Jewel support"

Browse Source
This commit is contained in:
Zuul 2019-05-02 16:53:23 +00:00 committed by Gerrit Code Review
commit 28767f4d91
7 changed files with 6 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,4 +5,4 @@ TAR="$TAR_NAME-$SHA.tar.gz"
COPY_LIST="${CGCS_BASE}/downloads/$TAR $PKG_BASE/files/*"
TIS_PATCH_VER=9
TIS_PATCH_VER=10

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

@ -18,8 +18,7 @@ BuildArch: noarch
Patch01: 0001-Allow-multiple-containers-per-daemonset-pod.patch
Patch02: 0002-Add-imagePullSecrets-in-service-account.patch
Patch03: 0003-Set-Min-NGINX-handles.patch
Patch04: 0004-Enable-Ceph-Jewel-support-for-gnocchi.patch
Patch05: 0005-Partial-revert-of-31e3469d28858d7b5eb6355e88b6f49fd6.patch
Patch04: 0004-Partial-revert-of-31e3469d28858d7b5eb6355e88b6f49fd6.patch
BuildRequires: helm
@ -32,7 +31,6 @@ Openstack Helm Infra charts
%patch02 -p1
%patch03 -p1
%patch04 -p1
%patch05 -p1
%build
# initialize helm and build the toolkit

2
openstack/openstack-helm-infra/files/0001-Allow-multiple-containers-per-daemonset-pod.patch
View File

@ -1,7 +1,7 @@
From 47315e28d44cff586f6fff026dd00e61c2c77bcd Mon Sep 17 00:00:00 2001
From: Gerry Kopec <Gerry.Kopec@windriver.com>
Date: Wed, 9 Jan 2019 20:11:33 -0500
Subject: [PATCH 1/5] Allow multiple containers per daemonset pod
Subject: [PATCH 1/4] Allow multiple containers per daemonset pod
Remove code that restricted daemonset pods to single containers.
Container names will default to name from helm chart template.

2
openstack/openstack-helm-infra/files/0002-Add-imagePullSecrets-in-service-account.patch
View File

@ -1,7 +1,7 @@
From ac3f9db5ac1a19af71136752f5709ba1da55d201 Mon Sep 17 00:00:00 2001
From: Angie Wang <angie.wang@windriver.com>
Date: Mon, 11 Feb 2019 11:29:03 -0500
Subject: [PATCH 2/5] Add imagePullSecrets in service account
Subject: [PATCH 2/4] Add imagePullSecrets in service account
Signed-off-by: Robert Church <robert.church@windriver.com>
---

2
openstack/openstack-helm-infra/files/0003-Set-Min-NGINX-handles.patch
View File

@ -1,7 +1,7 @@
From 93ec2454cba41bf3de1419bada1f145f1ca9dbd9 Mon Sep 17 00:00:00 2001
From: Al Bailey <Al.Bailey@windriver.com>
Date: Wed, 20 Feb 2019 13:56:27 -0600
Subject: [PATCH 3/5] Set Min NGINX handles
Subject: [PATCH 3/4] Set Min NGINX handles
Signed-off-by: Robert Church <robert.church@windriver.com>
---

50
openstack/openstack-helm-infra/files/0004-Enable-Ceph-Jewel-support-for-gnocchi.patch
View File

@ -1,50 +0,0 @@
From 71972bb0f45ca2bdd1aefa70061d087400b5251c Mon Sep 17 00:00:00 2001
From: Robert Church <robert.church@windriver.com>
Date: Fri, 22 Mar 2019 13:02:23 -0400
Subject: [PATCH 4/5] Enable Ceph Jewel support for gnocchi
Current upstream charts align to Ceph Luminous/Mimic. Revert
functionality that is not present in Jewel.
Drop this after the Ceph rebase to Mimic is complete.
Signed-off-by: Robert Church <robert.church@windriver.com>
---
gnocchi/templates/bin/_storage-init.sh.tpl | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/gnocchi/templates/bin/_storage-init.sh.tpl b/gnocchi/templates/bin/_storage-init.sh.tpl
index 328d27b..39a0f8c 100644
--- a/gnocchi/templates/bin/_storage-init.sh.tpl
+++ b/gnocchi/templates/bin/_storage-init.sh.tpl
@@ -36,19 +36,15 @@ function ensure_pool () {
ensure_pool ${RBD_POOL_NAME} ${RBD_POOL_CHUNK_SIZE} "gnocchi-metrics"
if USERINFO=$(ceph auth get client.${RBD_POOL_USER}); then
- echo "Cephx user client.${RBD_POOL_USER} already exist."
- echo "Update its cephx caps"
- ceph auth caps client.${RBD_POOL_USER} \
- mon "profile r" \
- osd "profile rwx pool=${RBD_POOL_NAME}" \
- mgr "allow r"
- ceph auth get client.${RBD_POOL_USER} -o ${KEYRING}
+ KEYSTR=$(echo $USERINFO | sed 's/.*\( key = .*\) caps mon.*/\1/')
+ echo $KEYSTR > ${KEYRING}
else
- ceph auth get-or-create client.${RBD_POOL_USER} \
- mon "profile r" \
- osd "profile rwx pool=${RBD_POOL_NAME}" \
- mgr "allow r" \
- -o ${KEYRING}
+ #NOTE(Portdirect): Determine proper privs to assign keyring
+ ceph auth get-or-create client.${RBD_POOL_USER} \
+ mon "allow *" \
+ osd "allow *" \
+ mgr "allow *" \
+ -o ${KEYRING}
fi
ENCODED_KEYRING=$(sed -n 's/^[[:blank:]]*key[[:blank:]]\+=[[:blank:]]\(.*\)/\1/p' ${KEYRING} | base64 -w0)
--
2.16.5

2
openstack/openstack-helm-infra/files/0005-Partial-revert-of-31e3469d28858d7b5eb6355e88b6f49fd6.patch → openstack/openstack-helm-infra/files/0004-Partial-revert-of-31e3469d28858d7b5eb6355e88b6f49fd6.patch
View File

@ -1,7 +1,7 @@
From b3829fef30e76fdf498fa1d0d35185f642dce5f6 Mon Sep 17 00:00:00 2001
From: Robert Church <robert.church@windriver.com>
Date: Mon, 8 Apr 2019 02:12:39 -0400
Subject: [PATCH 5/5] Partial revert of
Subject: [PATCH 4/4] Partial revert of
31e3469d28858d7b5eb6355e88b6f49fd62032be
Suspect that new use of mergeOverwrite vs. merge is breaking the