8254cd31bb
This change upversion our base commit SHA for openstack-helm, in order to be more updated in comparison with openstack/openstack-helm main branch. It also ports all StarlingX specific patches on top of it, dropping patches that are no longer needed and updating what needs to be updated in order to be applied on top of the new base SHA, taking this chance to also update the numbering/ordering of stx patches. Also, a new STX patch was created (0018) due to [2]. This upstream change was removing the helm-toolkit chart dependency from a local server, since Helm v3 no longer supports "helm serve" [3], and pointing it to a given openstack-helm-infra directory in which the helm-toolkit chart should be placed. The stx-openstack version of openstack-helm does not require this change while it is relying on chartmuseum for serving charts locally [4]. [1] https://review.opendev.org/c/starlingx/openstack-armada-app/+/887637 [2] c20c1e4400f5935adf0afd0c65bef2bb12af598b [3] https://helm.sh/docs/topics/v2_v3_migration/ [4] https://opendev.org/starlingx/openstack-armada-app/src/branch/r/stx.8.0/stx-openstack-helm-fluxcd/debian/deb_folder/control#L6 Test Plan: PASS - Build openstack-helm package PASS - Build stx-openstack application tarball PASS - Apply/Remove stx-openstack PASS - Apply/Remove stx-openstack PASS - Apply/Remove stx-openstack with TLS enabled PASS - Run stx-openstack sanity tests (AIO-SX)* * No major issue found, 2 TCs failed but does not seem related to this upversion and if a consistent failure is confirmed a launchpad can be created later. Story: 2010715 Task: 47886 Signed-off-by: Thales Elero Cervi <thaleselero.cervi@windriver.com> Change-Id: I605b2d17303e46eef407a49c6f19852abe08ec3e
56 lines
2.0 KiB
Diff
56 lines
2.0 KiB
Diff
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] 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.
|
|
|
|
Note: the pid file is somewhat confusingly called
|
|
/var/run/httpd/httpd.pid and /var/run/apache2 is just a symlink to
|
|
/var/run/httpd.
|
|
|
|
This is loosely based off the in-review upstream commit at
|
|
https://review.openstack.org/#/c/619747
|
|
|
|
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 ++----
|
|
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 3ba90d99..4b774529 100644
|
|
--- a/ceilometer/templates/bin/_ceilometer-api.sh.tpl
|
|
+++ b/ceilometer/templates/bin/_ceilometer-api.sh.tpl
|
|
@@ -40,6 +40,9 @@ function start () {
|
|
fi
|
|
fi
|
|
|
|
+ # Get rid of stale pid file if present.
|
|
+ rm -f /var/run/apache2/*.pid
|
|
+
|
|
# Start Apache2
|
|
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 d7350674..f6216df1 100644
|
|
--- a/keystone/templates/bin/_keystone-api.sh.tpl
|
|
+++ b/keystone/templates/bin/_keystone-api.sh.tpl
|
|
@@ -41,10 +41,8 @@ function start () {
|
|
source /etc/apache2/envvars
|
|
fi
|
|
|
|
- if [ -f /var/run/apache2/apache2.pid ]; then
|
|
- # Remove the stale pid for debian/ubuntu images
|
|
- rm -f /var/run/apache2/apache2.pid
|
|
- fi
|
|
+ # Get rid of stale pid, shared memory segment and wsgi sock files if present.
|
|
+ rm -f /var/run/apache2/*
|
|
|
|
# Start Apache2
|
|
exec {{ .Values.conf.software.apache2.binary }} {{ .Values.conf.software.apache2.start_parameters }}
|
|
--
|
|
2.25.1
|
|
|