starlingx/upstream
Code Issues Proposed changes

Stein: Remove ceilometer-upgrade option

Browse Source 
This removes the --skip-metering-database option from _db-sync.sh.tpl.
This option was removed with the deprecated storage drivers in
Queens.

Change-Id: I6c88f882c9e54841c9eeb97c5010cf0691804a62
Story: 2004751
Task: 28894
Signed-off-by: Robert Church <robert.church@windriver.com>
This commit is contained in:
Robert Church 2019-01-14 10:33:50 -05:00 committed by Bob Church
parent d7964a17fb
commit 536fd15055
3 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack/openstack-helm/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=6
TIS_PATCH_VER=7

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

@ -23,6 +23,7 @@ Patch02: 0002-Add-Aodh-Chart.patch
Patch03: 0003-Add-Panko-Chart.patch
Patch04: Remove-stale-Apache2-service-pids-when-a-POD-starts.patch
Patch05: 0005-Add-heat-purge-deleted-cron-job.patch
Patch06: 0006-Stein-Remove-ceilometer-upgrade-option.patch
BuildRequires: helm
BuildRequires: openstack-helm-infra
@ -38,6 +39,7 @@ Openstack Helm charts
%patch03 -p1
%patch04 -p1
%patch05 -p1
%patch06 -p1
%build
# initialize helm and build the toolkit

27
openstack/openstack-helm/files/0006-Stein-Remove-ceilometer-upgrade-option.patch Normal file
View File

@ -0,0 +1,27 @@
From dc57c567018f8ab2c11bd7dd426cb1176d35e7db Mon Sep 17 00:00:00 2001
From: Robert Church <robert.church@windriver.com>
Date: Fri, 11 Jan 2019 16:57:44 -0500
Subject: [PATCH 6/8] Stein: Remove ceilometer-upgrade option
This removes the --skip-metering-database option from _db-sync.sh.tpl.
This option was removed with the deprecated storage drivers in
Queens.
Signed-off-by: Robert Church <robert.church@windriver.com>
---
ceilometer/templates/bin/_db-sync.sh.tpl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ceilometer/templates/bin/_db-sync.sh.tpl b/ceilometer/templates/bin/_db-sync.sh.tpl
index ba7c1d84..d649654b 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.
set -ex
-exec ceilometer-upgrade --skip-metering-database
+exec ceilometer-upgrade
--
2.16.5