From ac35d5d6451073c62bbeb5723b1221ff7de775b6 Mon Sep 17 00:00:00 2001 From: Don Penney Date: Thu, 23 May 2019 10:47:35 -0400 Subject: [PATCH] Update stx-gnocchi image to drop fork This commit updates the stx-gnocchi image directives files to point to the upstream gnocchi repo, rather than the temporary fork. Change-Id: Ie8d7076fa35e8bb924c1f67b5ab2a3fc8d532d34 Story: 2004751 Task: 33480 Signed-off-by: Don Penney --- .../python-gnocchi/centos/stx-gnocchi.dev_docker_image | 7 +------ .../python-gnocchi/centos/stx-gnocchi.stable_docker_image | 8 ++------ 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/openstack/python-gnocchi/centos/stx-gnocchi.dev_docker_image b/openstack/python-gnocchi/centos/stx-gnocchi.dev_docker_image index 36b14873..44d69001 100644 --- a/openstack/python-gnocchi/centos/stx-gnocchi.dev_docker_image +++ b/openstack/python-gnocchi/centos/stx-gnocchi.dev_docker_image @@ -1,12 +1,7 @@ BUILDER=loci LABEL=stx-gnocchi PROJECT=gnocchi -# 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 +PROJECT_REPO=https://github.com/gnocchixyz/gnocchi.git PIP_PACKAGES="pylint SQLAlchemy SQLAlchemy-Utils oslo.db keystonemiddleware gnocchiclient pymemcache psycopg2" DIST_PACKAGES="python-rados" PROFILES="gnocchi apache" diff --git a/openstack/python-gnocchi/centos/stx-gnocchi.stable_docker_image b/openstack/python-gnocchi/centos/stx-gnocchi.stable_docker_image index 36b14873..b3fd5ca5 100644 --- a/openstack/python-gnocchi/centos/stx-gnocchi.stable_docker_image +++ b/openstack/python-gnocchi/centos/stx-gnocchi.stable_docker_image @@ -1,12 +1,8 @@ BUILDER=loci LABEL=stx-gnocchi PROJECT=gnocchi -# 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 +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" PROFILES="gnocchi apache"