From 4171f83a8c9629cb9dcbdc133eec911aab2282c7 Mon Sep 17 00:00:00 2001 From: Don Penney Date: Tue, 15 Jan 2019 15:00:39 -0500 Subject: [PATCH] Update stx-gnocchi.master to use forked gnocchi repo Until the ceph upgrade is complete, a forked gnocchi repo will be used for the stx-gnocchi image to allow temporary changes to the gnocchi source to support the older ceph version. Change-Id: I370086ca01e95e8b4907951328f29d833847b6b7 Story: 2004520 Task: 28912 Signed-off-by: Don Penney --- .../centos/stx-gnocchi.master_docker_image | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/openstack/python-gnocchi/centos/stx-gnocchi.master_docker_image b/openstack/python-gnocchi/centos/stx-gnocchi.master_docker_image index 44d69001..2af1e991 100644 --- a/openstack/python-gnocchi/centos/stx-gnocchi.master_docker_image +++ b/openstack/python-gnocchi/centos/stx-gnocchi.master_docker_image @@ -1,8 +1,14 @@ BUILDER=loci LABEL=stx-gnocchi PROJECT=gnocchi -PROJECT_REPO=https://github.com/gnocchixyz/gnocchi.git +# Temporarily pointing to forked gnocchi repo +# This is necessary to revert a specific commit that does +# not support the older CEPH currently in starlingx. +# Once the CEPH upgrade is complete, we can go back +# to using the main repo +PROJECT_REPO=https://github.com/donpenney/gnocchi.git PIP_PACKAGES="pylint SQLAlchemy SQLAlchemy-Utils oslo.db keystonemiddleware gnocchiclient pymemcache psycopg2" -DIST_PACKAGES="python-rados" +# python-rados is provided by ceph, so specify an older version to install +DIST_PACKAGES="python-rados-10.2.5" PROFILES="gnocchi apache"