starlingx
/
upstream
Code Issues Proposed changes

Fix gnocchi-api could not start up issue 

After using python3 to build image, need change related
profile and customization like we did for other service
in directives file.

Test pass for openstack apply with 4 additional services enabled

Partial-Bug: 1886819

Change-Id: Ifdfce220b43166345888b1384f62c4ab8f46ba27
Signed-off-by: Zhipeng Liu <zhipengs.liu@intel.com>
(cherry picked from commit e96d8b7177)
This commit is contained in:
Zhipeng Liu 2020-07-10 18:37:25 +08:00 committed by zhipeng liu
parent fe7d2a3e8a
commit bfc2f13863
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openstack/python-gnocchi/centos/stx-gnocchi.dev_docker_image
View File

@ -3,7 +3,11 @@ LABEL=stx-gnocchi
PROJECT=gnocchi
PROJECT_REPO=https://github.com/gnocchixyz/gnocchi.git
PIP_PACKAGES="pylint SQLAlchemy SQLAlchemy-Utils oslo.db keystonemiddleware gnocchiclient pymemcache psycopg2"
DIST_PACKAGES="python-rados"
DIST_PACKAGES="python3-rados"
PROFILES="gnocchi apache"
CUSTOMIZATION="\
cp /opt/rh/httpd24/root/etc/httpd/conf.modules.d/10-rh-python36-wsgi.conf /etc/httpd/conf.modules.d/10-wsgi.conf && \
cp /opt/rh/httpd24/root/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \
"
PYTHON3=yes

6
openstack/python-gnocchi/centos/stx-gnocchi.stable_docker_image
View File

@ -4,7 +4,11 @@ PROJECT=gnocchi
PROJECT_REPO=https://github.com/gnocchixyz/gnocchi.git
PROJECT_REF=4.3.2
PIP_PACKAGES="pylint SQLAlchemy SQLAlchemy-Utils oslo.db keystonemiddleware gnocchiclient pymemcache psycopg2"
DIST_PACKAGES="python-rados"
DIST_PACKAGES="python3-rados"
PROFILES="gnocchi apache"
CUSTOMIZATION="\
cp /opt/rh/httpd24/root/etc/httpd/conf.modules.d/10-rh-python36-wsgi.conf /etc/httpd/conf.modules.d/10-wsgi.conf && \
cp /opt/rh/httpd24/root/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \
"
PYTHON3=yes