Browse Source

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

Change-Id: I291eb706df84489398b4f4b2736d7c5ab2e84747
changes/42/655042/3
caoyuan 3 years ago committed by Michael Johnson
parent
commit
1910f024a3
  1. 2
      README.rst
  2. 2
      devstack/README.md
  3. 4
      devstack/samples/multinode/Vagrantfile
  4. 4
      devstack/samples/multinode/local-2.conf
  5. 8
      devstack/samples/multinode/local.conf
  6. 2
      devstack/samples/singlenode/Vagrantfile
  7. 8
      devstack/samples/singlenode/local.conf
  8. 4
      devstack/upgrade/settings
  9. 4
      doc/source/admin/guides/upgrade.rst
  10. 2
      doc/source/admin/providers.rst
  11. 4
      elements/amphora-agent/source-repository-amphora-agent
  12. 6
      octavia/tests/contrib/gate_hook.sh
  13. 10
      tox.ini

2
README.rst

@ -36,7 +36,7 @@ Release notes for the Octavia project are available at
https://docs.openstack.org/releasenotes/octavia/
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
https://storyboard.openstack.org/#!/project/openstack/octavia

2
devstack/README.md

@ -17,7 +17,7 @@ where
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

4
devstack/samples/multinode/Vagrantfile vendored

@ -17,7 +17,7 @@ Vagrant.configure(2) do |config|
sudo apt-get -y upgrade
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.sh ~/devstack/local-manual.sh
cp /vagrant/webserver.sh ~/devstack
@ -39,7 +39,7 @@ Vagrant.configure(2) do |config|
sudo apt-get -y upgrade
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
cd ~/devstack

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

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

8
devstack/samples/multinode/local.conf

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

2
devstack/samples/singlenode/Vagrantfile vendored

@ -86,7 +86,7 @@ Vagrant.configure(2) do |config|
sudo apt-get -y upgrade
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
cd ~/devstack
./stack.sh

8
devstack/samples/singlenode/local.conf

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

4
devstack/upgrade/settings

@ -1,8 +1,8 @@
register_project_for_upgrade octavia
register_db_to_save octavia
devstack_localrc base enable_plugin octavia https://git.openstack.org/openstack/octavia
devstack_localrc target 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://opendev.org/openstack/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

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

@ -38,7 +38,7 @@ operators should observe:
Compute, Networking, Image and Identify. On a staging environment, upgrade
the Load Balancing service and verify it works as expected. For example, a
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
============
@ -93,7 +93,7 @@ DevStack to initially perform a base OpenStack install and then upgrade to a
target version.
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
Octavia enabled. The plugin creates load balancing resources and verifies that
resources are still working during and after upgrade.

2
doc/source/admin/providers.rst

@ -52,7 +52,7 @@ Default provider name: **amphora**
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/

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

@ -1,3 +1,3 @@
# This is used for source-based builds
amphora-agent git /opt/amphora-agent https://git.openstack.org/openstack/octavia
upper-constraints file /opt/upper-constraints.txt https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt
amphora-agent git /opt/amphora-agent https://opendev.org/openstack/octavia
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

@ -14,7 +14,7 @@ function load_conf_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
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
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'
}
function _setup_octavia {
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
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'

10
tox.ini

@ -8,7 +8,7 @@ usedevelop = True
setenv = VIRTUAL_ENV={envdir}
PYTHONWARNINGS=default::DeprecationWarning
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
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
@ -21,7 +21,7 @@ basepython = python3
# This environment is called from CI scripts to test and publish
# the API Ref to developer.openstack.org.
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}/doc/requirements.txt
whitelist_externals = rm
@ -82,7 +82,7 @@ whitelist_externals =
[testenv:docs]
basepython = python3
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}/doc/requirements.txt
whitelist_externals = rm
@ -152,7 +152,7 @@ max-line-length = 79
[testenv:releasenotes]
basepython = python3
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}/doc/requirements.txt
whitelist_externals = rm
@ -196,7 +196,7 @@ commands =
[testenv:requirements]
basepython = python3
deps =
-egit+https://git.openstack.org/openstack/requirements#egg=openstack-requirements
-egit+https://opendev.org/openstack/requirements#egg=openstack-requirements
whitelist_externals = sh
commands =
sh -c '{envdir}/src/openstack-requirements/playbooks/files/project-requirements-change.py --req {envdir}/src/openstack-requirements --local {toxinidir} master'

Loading…
Cancel
Save