From 140e7383e3a60b920f3f1ead7982115530ef6f06 Mon Sep 17 00:00:00 2001 From: Don Penney Date: Thu, 23 May 2019 10:34:40 -0400 Subject: [PATCH] Revert ovs-dpdk vbox code from stx-neutron 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 --- .../python-neutron/centos/stx-neutron.dev_docker_image | 8 +------- .../centos/stx-neutron.stable_docker_image | 9 ++------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/openstack/python-neutron/centos/stx-neutron.dev_docker_image b/openstack/python-neutron/centos/stx-neutron.dev_docker_image index babc690d..b48b004b 100644 --- a/openstack/python-neutron/centos/stx-neutron.dev_docker_image +++ b/openstack/python-neutron/centos/stx-neutron.dev_docker_image @@ -1,13 +1,7 @@ BUILDER=loci LABEL=stx-neutron PROJECT=neutron -# Temporarily pointing to forked neutron repo -# 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 +PROJECT_REPO=https://opendev.org/openstack/neutron.git PIP_PACKAGES="networking-sfc pycrypto pylint tinyrpc lxml" DIST_PACKAGES="ethtool lshw" PROFILES="fluent neutron linuxbridge openvswitch" diff --git a/openstack/python-neutron/centos/stx-neutron.stable_docker_image b/openstack/python-neutron/centos/stx-neutron.stable_docker_image index babc690d..7d4d6e02 100644 --- a/openstack/python-neutron/centos/stx-neutron.stable_docker_image +++ b/openstack/python-neutron/centos/stx-neutron.stable_docker_image @@ -1,13 +1,8 @@ BUILDER=loci LABEL=stx-neutron PROJECT=neutron -# Temporarily pointing to forked neutron repo -# 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 +PROJECT_REPO=https://opendev.org/openstack/neutron.git +PROJECT_REF=stable/stein PIP_PACKAGES="networking-sfc pycrypto pylint tinyrpc lxml" DIST_PACKAGES="ethtool lshw" PROFILES="fluent neutron linuxbridge openvswitch"