From bfc2f138634e4487db037d096194c4c086fe541d Mon Sep 17 00:00:00 2001 From: Zhipeng Liu Date: Fri, 10 Jul 2020 18:37:25 +0800 Subject: [PATCH] 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 (cherry picked from commit e96d8b71778413710cd369cc32c1f2a9ee95e986) --- .../python-gnocchi/centos/stx-gnocchi.dev_docker_image | 6 +++++- .../python-gnocchi/centos/stx-gnocchi.stable_docker_image | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/openstack/python-gnocchi/centos/stx-gnocchi.dev_docker_image b/openstack/python-gnocchi/centos/stx-gnocchi.dev_docker_image index 6b030922..f27db392 100644 --- a/openstack/python-gnocchi/centos/stx-gnocchi.dev_docker_image +++ b/openstack/python-gnocchi/centos/stx-gnocchi.dev_docker_image @@ -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 diff --git a/openstack/python-gnocchi/centos/stx-gnocchi.stable_docker_image b/openstack/python-gnocchi/centos/stx-gnocchi.stable_docker_image index d4f48588..984b3030 100644 --- a/openstack/python-gnocchi/centos/stx-gnocchi.stable_docker_image +++ b/openstack/python-gnocchi/centos/stx-gnocchi.stable_docker_image @@ -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