openstack
/
octavia
Code Issues Proposed changes

Replace git.openstack.org URLs with opendev.org URLs 

Change-Id: I291eb706df84489398b4f4b2736d7c5ab2e84747
This commit is contained in:
caoyuan 2019-04-23 19:39:00 +08:00 committed by Michael Johnson
parent 28fe8ed45e
commit 1910f024a3
13 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.rst
View File

@ -36,7 +36,7 @@ Release notes for the Octavia project are available at
https://docs.openstack.org/releasenotes/octavia/ https://docs.openstack.org/releasenotes/octavia/
The project source code repository is located at The project source code repository is located at
https://git.openstack.org/cgit/openstack/octavia https://opendev.org/openstack/octavia
Project status, bugs, and requests for feature enhancements are tracked on Project status, bugs, and requests for feature enhancements are tracked on
https://storyboard.openstack.org/#!/project/openstack/octavia https://storyboard.openstack.org/#!/project/openstack/octavia

2
devstack/README.md
View File

@ -17,7 +17,7 @@ where
For example For example
enable_plugin octavia https://git.openstack.org/openstack/octavia master enable_plugin octavia https://opendev.org/openstack/octavia master
2) Enable the Octavia services 2) Enable the Octavia services

4
devstack/samples/multinode/Vagrantfile vendored
View File

@ -17,7 +17,7 @@ Vagrant.configure(2) do |config|
sudo apt-get -y upgrade sudo apt-get -y upgrade
sudo apt-get -y install git sudo apt-get -y install git
git clone https://git.openstack.org/openstack-dev/devstack git clone https://opendev.org/openstack/devstack
cp /vagrant/local.conf ~/devstack cp /vagrant/local.conf ~/devstack
cp /vagrant/local.sh ~/devstack/local-manual.sh cp /vagrant/local.sh ~/devstack/local-manual.sh
cp /vagrant/webserver.sh ~/devstack cp /vagrant/webserver.sh ~/devstack
@ -39,7 +39,7 @@ Vagrant.configure(2) do |config|
sudo apt-get -y upgrade sudo apt-get -y upgrade
sudo apt-get -y install git sudo apt-get -y install git
git clone https://git.openstack.org/openstack-dev/devstack git clone https://opendev.org/openstack/devstack
cp /vagrant/local-2.conf ~/devstack/local.conf cp /vagrant/local-2.conf ~/devstack/local.conf
cd ~/devstack cd ~/devstack

4
devstack/samples/multinode/local-2.conf
View File

@ -7,8 +7,8 @@ RECLONE=True
# Load the external LBaaS plugin. # Load the external LBaaS plugin.
enable_plugin neutron https://git.openstack.org/openstack/neutron enable_plugin neutron https://opendev.org/openstack/neutron
enable_plugin octavia https://git.openstack.org/openstack/octavia enable_plugin octavia https://opendev.org/openstack/octavia
LIBS_FROM_GIT+=python-octaviaclient LIBS_FROM_GIT+=python-octaviaclient
DATABASE_PASSWORD=password DATABASE_PASSWORD=password

8
devstack/samples/multinode/local.conf
View File

@ -7,10 +7,10 @@ RECLONE=True
# Load the external Octavia plugin. # Load the external Octavia plugin.
enable_plugin barbican https://git.openstack.org/openstack/barbican enable_plugin barbican https://opendev.org/openstack/barbican
enable_plugin neutron https://git.openstack.org/openstack/neutron enable_plugin neutron https://opendev.org/openstack/neutron
enable_plugin octavia-dashboard https://git.openstack.org/openstack/octavia-dashboard enable_plugin octavia-dashboard https://opendev.org/openstack/octavia-dashboard
enable_plugin octavia https://git.openstack.org/openstack/octavia enable_plugin octavia https://opendev.org/openstack/octavia
LIBS_FROM_GIT+=python-octaviaclient LIBS_FROM_GIT+=python-octaviaclient
DATABASE_PASSWORD=password DATABASE_PASSWORD=password

2
devstack/samples/singlenode/Vagrantfile vendored
View File

@ -86,7 +86,7 @@ Vagrant.configure(2) do |config|
sudo apt-get -y upgrade sudo apt-get -y upgrade
sudo apt-get -y install git sudo apt-get -y install git
git clone https://git.openstack.org/openstack-dev/devstack git clone https://opendev.org/openstack/devstack
cp /vagrant/local.* /vagrant/webserver.sh ~/devstack cp /vagrant/local.* /vagrant/webserver.sh ~/devstack
cd ~/devstack cd ~/devstack
./stack.sh ./stack.sh

8
devstack/samples/singlenode/local.conf
View File

@ -20,10 +20,10 @@ RECLONE=True
# Load the external Octavia plugin. # Load the external Octavia plugin.
enable_plugin barbican https://git.openstack.org/openstack/barbican enable_plugin barbican https://opendev.org/openstack/barbican
enable_plugin neutron https://git.openstack.org/openstack/neutron enable_plugin neutron https://opendev.org/openstack/neutron
enable_plugin octavia https://git.openstack.org/openstack/octavia enable_plugin octavia https://opendev.org/openstack/octavia
enable_plugin octavia-dashboard https://git.openstack.org/openstack/octavia-dashboard enable_plugin octavia-dashboard https://opendev.org/openstack/octavia-dashboard
LIBS_FROM_GIT+=python-octaviaclient LIBS_FROM_GIT+=python-octaviaclient
DATABASE_PASSWORD=password DATABASE_PASSWORD=password

4
devstack/upgrade/settings
View File

@ -1,8 +1,8 @@
register_project_for_upgrade octavia register_project_for_upgrade octavia
register_db_to_save octavia register_db_to_save octavia
devstack_localrc base enable_plugin octavia https://git.openstack.org/openstack/octavia devstack_localrc base enable_plugin octavia https://opendev.org/openstack/octavia
devstack_localrc target enable_plugin octavia https://git.openstack.org/openstack/octavia devstack_localrc target enable_plugin octavia https://opendev.org/openstack/octavia
devstack_localrc base enable_service o-api o-cw o-hm o-hk octavia devstack_localrc base enable_service o-api o-cw o-hm o-hk octavia
devstack_localrc target enable_service o-api o-cw o-hm o-hk octavia devstack_localrc target enable_service o-api o-cw o-hm o-hk octavia

4
doc/source/admin/guides/upgrade.rst
View File

@ -38,7 +38,7 @@ operators should observe:
Compute, Networking, Image and Identify. On a staging environment, upgrade Compute, Networking, Image and Identify. On a staging environment, upgrade
the Load Balancing service and verify it works as expected. For example, a the Load Balancing service and verify it works as expected. For example, a
good indicator would be the successful run of `Octavia Tempest tests good indicator would be the successful run of `Octavia Tempest tests
<https://git.openstack.org/cgit/openstack/octavia-tempest-plugin>`. <https://opendev.org/openstack/octavia-tempest-plugin>`.
Cold upgrade Cold upgrade
============ ============
@ -93,7 +93,7 @@ DevStack to initially perform a base OpenStack install and then upgrade to a
target version. target version.
Octavia has a `Grenade plugin Octavia has a `Grenade plugin
<https://git.openstack.org/cgit/openstack/octavia/tree/devstack/upgrade>`_ and <https://opendev.org/openstack/octavia/src/branch/master/devstack/upgrade>`_ and
a CI gate job that validates cold upgrades of an OpenStack deployment with a CI gate job that validates cold upgrades of an OpenStack deployment with
Octavia enabled. The plugin creates load balancing resources and verifies that Octavia enabled. The plugin creates load balancing resources and verifies that
resources are still working during and after upgrade. resources are still working during and after upgrade.

2
doc/source/admin/providers.rst
View File

@ -52,7 +52,7 @@ Default provider name: **amphora**
The driver package: https://pypi.org/project/octavia/ The driver package: https://pypi.org/project/octavia/
The driver source: https://git.openstack.org/cgit/openstack/octavia/ The driver source: https://opendev.org/openstack/octavia/
The documentation: https://docs.openstack.org/octavia/latest/ The documentation: https://docs.openstack.org/octavia/latest/

4
elements/amphora-agent/source-repository-amphora-agent
View File

@ -1,3 +1,3 @@
# This is used for source-based builds # This is used for source-based builds
amphora-agent git /opt/amphora-agent https://git.openstack.org/openstack/octavia amphora-agent git /opt/amphora-agent https://opendev.org/openstack/octavia
upper-constraints file /opt/upper-constraints.txt https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt upper-constraints file /opt/upper-constraints.txt https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt

6
octavia/tests/contrib/gate_hook.sh
View File

@ -14,7 +14,7 @@ function load_conf_hook {
_DEVSTACK_LOCAL_CONFIG_TAIL+=$'\n'"$(cat $GATE_HOOKS/$hook)" _DEVSTACK_LOCAL_CONFIG_TAIL+=$'\n'"$(cat $GATE_HOOKS/$hook)"
} }
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin barbican https://git.openstack.org/openstack/barbican"$'\n' export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin barbican https://opendev.org/openstack/barbican"$'\n'
# Allow testing against diskimage-builder changes with depends-on # Allow testing against diskimage-builder changes with depends-on
export DEVSTACK_LOCAL_CONFIG+=$'\n'"LIBS_FROM_GIT+=,diskimage-builder"$'\n' export DEVSTACK_LOCAL_CONFIG+=$'\n'"LIBS_FROM_GIT+=,diskimage-builder"$'\n'
@ -54,13 +54,13 @@ OCTAVIA_MGMT_PORT_IP=192.168.0.3"$'\n'
export DEVSTACK_SUBNODE_CONFIG+="$COMMON_MULTINODE_CONFIG export DEVSTACK_SUBNODE_CONFIG+="$COMMON_MULTINODE_CONFIG
OCTAVIA_NODE=second OCTAVIA_NODE=second
enable_plugin octavia https://git.openstack.org/openstack/octavia enable_plugin octavia https://opendev.org/openstack/octavia
OCTAVIA_MGMT_PORT_IP=192.168.0.4"$'\n' OCTAVIA_MGMT_PORT_IP=192.168.0.4"$'\n'
} }
function _setup_octavia { function _setup_octavia {
export DEVSTACK_LOCAL_CONFIG+=$'\n'"OCTAVIA_DIB_TRACING=True"$'\n' export DEVSTACK_LOCAL_CONFIG+=$'\n'"OCTAVIA_DIB_TRACING=True"$'\n'
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin octavia https://git.openstack.org/openstack/octavia"$'\n' export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin octavia https://opendev.org/openstack/octavia"$'\n'
# Use infra's cached version of the file # Use infra's cached version of the file
if [ -f /opt/stack/new/devstack/files/get-pip.py ]; then if [ -f /opt/stack/new/devstack/files/get-pip.py ]; then
export DEVSTACK_LOCAL_CONFIG+=$'\n'"DIB_REPOLOCATION_pip_and_virtualenv=file:///opt/stack/new/devstack/files/get-pip.py"$'\n' export DEVSTACK_LOCAL_CONFIG+=$'\n'"DIB_REPOLOCATION_pip_and_virtualenv=file:///opt/stack/new/devstack/files/get-pip.py"$'\n'

10
tox.ini
View File

@ -8,7 +8,7 @@ usedevelop = True
setenv = VIRTUAL_ENV={envdir} setenv = VIRTUAL_ENV={envdir}
PYTHONWARNINGS=default::DeprecationWarning PYTHONWARNINGS=default::DeprecationWarning
install_command = install_command =
pip install -U -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} pip install -U -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} {opts} {packages}
whitelist_externals = find whitelist_externals = find
deps = -r{toxinidir}/requirements.txt deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
@ -21,7 +21,7 @@ basepython = python3
# This environment is called from CI scripts to test and publish # This environment is called from CI scripts to test and publish
# the API Ref to developer.openstack.org. # the API Ref to developer.openstack.org.
deps = deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
whitelist_externals = rm whitelist_externals = rm
@ -82,7 +82,7 @@ whitelist_externals =
[testenv:docs] [testenv:docs]
basepython = python3 basepython = python3
deps = deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
whitelist_externals = rm whitelist_externals = rm
@ -152,7 +152,7 @@ max-line-length = 79
[testenv:releasenotes] [testenv:releasenotes]
basepython = python3 basepython = python3
deps = deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
whitelist_externals = rm whitelist_externals = rm
@ -196,7 +196,7 @@ commands =
[testenv:requirements] [testenv:requirements]
basepython = python3 basepython = python3
deps = deps =
-egit+https://git.openstack.org/openstack/requirements#egg=openstack-requirements -egit+https://opendev.org/openstack/requirements#egg=openstack-requirements
whitelist_externals = sh whitelist_externals = sh
commands = commands =
sh -c '{envdir}/src/openstack-requirements/playbooks/files/project-requirements-change.py --req {envdir}/src/openstack-requirements --local {toxinidir} master' sh -c '{envdir}/src/openstack-requirements/playbooks/files/project-requirements-change.py --req {envdir}/src/openstack-requirements --local {toxinidir} master'