starlingx/upstream
Code Issues Proposed changes

Update stx-gnocchi image to drop fork

Browse Source 
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 <don.penney@windriver.com>
This commit is contained in:
Don Penney 2019-05-23 10:47:35 -04:00
parent 7afcf23c4e
commit ac35d5d645
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,12 +1,7 @@
BUILDER=loci BUILDER=loci
LABEL=stx-gnocchi LABEL=stx-gnocchi
PROJECT=gnocchi PROJECT=gnocchi
# Temporarily pointing to forked gnocchi repo PROJECT_REPO=https://github.com/gnocchixyz/gnocchi.git
# 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" PIP_PACKAGES="pylint SQLAlchemy SQLAlchemy-Utils oslo.db keystonemiddleware gnocchiclient pymemcache psycopg2"
DIST_PACKAGES="python-rados" DIST_PACKAGES="python-rados"
PROFILES="gnocchi apache" PROFILES="gnocchi apache"

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

@ -1,12 +1,8 @@
BUILDER=loci BUILDER=loci
LABEL=stx-gnocchi LABEL=stx-gnocchi
PROJECT=gnocchi PROJECT=gnocchi
# Temporarily pointing to forked gnocchi repo PROJECT_REPO=https://github.com/gnocchixyz/gnocchi.git
# This is necessary to revert a specific commit that does PROJECT_REF=4.3.2
# 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" PIP_PACKAGES="pylint SQLAlchemy SQLAlchemy-Utils oslo.db keystonemiddleware gnocchiclient pymemcache psycopg2"
DIST_PACKAGES="python-rados" DIST_PACKAGES="python-rados"
PROFILES="gnocchi apache" PROFILES="gnocchi apache"