starlingx/upstream
Code Issues Proposed changes

Revert ovs-dpdk vbox code from stx-neutron

Browse Source 
This commit updates the stx-neutron image directives
files to point to the upstream neutron repo, rather
than the temporary fork.

Change-Id: Iebb790e28afad927a7e3545028cada4084f2334e
Story: 2004751
Task: 30063
Signed-off-by: Don Penney <don.penney@windriver.com>
This commit is contained in:
Don Penney 2019-05-23 10:34:40 -04:00
parent 7afcf23c4e
commit 140e7383e3
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openstack/python-neutron/centos/stx-neutron.dev_docker_image
View File

@ -1,13 +1,7 @@
BUILDER=loci BUILDER=loci
LABEL=stx-neutron LABEL=stx-neutron
PROJECT=neutron PROJECT=neutron
# Temporarily pointing to forked neutron repo PROJECT_REPO=https://opendev.org/openstack/neutron.git
# This is necessary to pull in specific commits
# that have not yet merged upstream.
# Once all required commits are merged, this can
# revert back to the upstream repo.
PROJECT_REPO=https://github.com/mpeters-wrs/neutron
PROJECT_REF=stx-networking
PIP_PACKAGES="networking-sfc pycrypto pylint tinyrpc lxml" PIP_PACKAGES="networking-sfc pycrypto pylint tinyrpc lxml"
DIST_PACKAGES="ethtool lshw" DIST_PACKAGES="ethtool lshw"
PROFILES="fluent neutron linuxbridge openvswitch" PROFILES="fluent neutron linuxbridge openvswitch"

9
openstack/python-neutron/centos/stx-neutron.stable_docker_image
View File

@ -1,13 +1,8 @@
BUILDER=loci BUILDER=loci
LABEL=stx-neutron LABEL=stx-neutron
PROJECT=neutron PROJECT=neutron
# Temporarily pointing to forked neutron repo PROJECT_REPO=https://opendev.org/openstack/neutron.git
# This is necessary to pull in specific commits PROJECT_REF=stable/stein
# that have not yet merged upstream.
# Once all required commits are merged, this can
# revert back to the upstream repo.
PROJECT_REPO=https://github.com/mpeters-wrs/neutron
PROJECT_REF=stx-networking
PIP_PACKAGES="networking-sfc pycrypto pylint tinyrpc lxml" PIP_PACKAGES="networking-sfc pycrypto pylint tinyrpc lxml"
DIST_PACKAGES="ethtool lshw" DIST_PACKAGES="ethtool lshw"
PROFILES="fluent neutron linuxbridge openvswitch" PROFILES="fluent neutron linuxbridge openvswitch"