From 910f2e72db8cc29e6924a1eca8d4431193472216 Mon Sep 17 00:00:00 2001 From: gujin Date: Mon, 27 May 2019 13:45:56 +0800 Subject: [PATCH] Replace git.openstack.org URLs with opendev.org URLs Thorough replacement of git.openstack.org URLs with their opendev.org counterparts. Change-Id: Ia04c82127761ee818a37efe6cf9137987f8262f8 --- README.rst | 6 +++--- contrib/vagrant/README.md | 2 +- devstack/local.conf.sample | 4 ++-- doc/source/devref/libnetwork_remote_driver_design.rst | 2 +- doc/source/fullstack-test.rst | 4 ++-- doc/source/install/compute-install-ubuntu.rst | 2 +- tox.ini | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.rst b/README.rst index cf4c9491..bb285ec7 100644 --- a/README.rst +++ b/README.rst @@ -30,7 +30,7 @@ K8s's CNI and so on, is maintained in separate Kuryr repo as a common library. * Free software: Apache license * Documentation: https://docs.openstack.org/kuryr-libnetwork/latest/ -* Source: http://git.openstack.org/cgit/openstack/kuryr-libnetwork +* Source: http://opendev.org/openstack/kuryr-libnetwork * Bugs: http://bugs.launchpad.net/kuryr-libnetwork Features @@ -158,7 +158,7 @@ Getting it from source :: - $ git clone https://git.openstack.org/openstack/kuryr-libnetwork + $ git clone https://opendev.org/openstack/kuryr-libnetwork $ cd kuryr-libnetwork @@ -301,7 +301,7 @@ contrib/docker/v2plugin/v2plugin_rootfs.sh in the top folder of kuryr-libentwork. This script will copy config.json to the top folder and build rootfs. :: - $ git clone https://git.openstack.org/openstack/kuryr-libnetwork + $ git clone https://opendev.org/openstack/kuryr-libnetwork $ cd kuryr-libnetwork $ ./contrib/docker/v2plugin/v2plugin_rootfs.sh $ docker plugin create kuryr/libnetwork2 ./ diff --git a/contrib/vagrant/README.md b/contrib/vagrant/README.md index 9890680b..c33550c4 100644 --- a/contrib/vagrant/README.md +++ b/contrib/vagrant/README.md @@ -59,7 +59,7 @@ Vagrant provisioning. For example, to use OVN as the Neutron plugin with Kuryr, you can create a "user_local.conf" with the following configuration: - enable_plugin networking-ovn http://git.openstack.org/openstack/networking-ovn + enable_plugin networking-ovn http://opendev.org/openstack/networking-ovn enable_service ovn-northd enable_service ovn-controller disable_service q-agt diff --git a/devstack/local.conf.sample b/devstack/local.conf.sample index 940d1a44..4644a7d6 100644 --- a/devstack/local.conf.sample +++ b/devstack/local.conf.sample @@ -17,8 +17,8 @@ ENABLE_PLUGINV2=False LIBS_FROM_GIT=kuryr enable_plugin devstack-plugin-container https://github.com/openstack/devstack-plugin-container -enable_plugin kuryr-libnetwork https://git.openstack.org/openstack/kuryr-libnetwork -enable_plugin neutron https://git.openstack.org/openstack/neutron +enable_plugin kuryr-libnetwork https://opendev.org/openstack/kuryr-libnetwork +enable_plugin neutron https://opendev.org/openstack/neutron # Use Neutron instead of nova-network disable_service n-net diff --git a/doc/source/devref/libnetwork_remote_driver_design.rst b/doc/source/devref/libnetwork_remote_driver_design.rst index 8382ac6a..d1f920f8 100644 --- a/doc/source/devref/libnetwork_remote_driver_design.rst +++ b/doc/source/devref/libnetwork_remote_driver_design.rst @@ -26,7 +26,7 @@ Kuryr Workflow - Host Networking -------------------------------- Kuryr resides in each host that runs Docker containers and serves `APIs `_ required for the libnetwork remote network driver. It is planned to use the -`Adding tags to resources `_ +`Adding tags to resources `_ new Neutron feature by Kuryr, to map between Neutron resource Id's and Docker Id's (UUID's) diff --git a/doc/source/fullstack-test.rst b/doc/source/fullstack-test.rst index 5ee976c6..7a2837fc 100644 --- a/doc/source/fullstack-test.rst +++ b/doc/source/fullstack-test.rst @@ -16,12 +16,12 @@ Clone DevStack:: sudo mkdir -p /opt/stack sudo chown $USER /opt/stack - git clone https://git.openstack.org/openstack-dev/devstack /opt/stack/devstack + git clone https://opendev.org/openstack/devstack /opt/stack/devstack We will run devstack with minimal local.conf settings required. You can use the sample local.conf as a quick-start:: - git clone https://git.openstack.org/openstack/kuryr-libnetwork /opt/stack/kuryr-libnetwork + git clone https://opendev.org/openstack/kuryr-libnetwork /opt/stack/kuryr-libnetwork cp /opt/stack/kuryr-libnetwork/devstack/local.conf.sample /opt/stack/devstack/local.conf Run DevStack:: diff --git a/doc/source/install/compute-install-ubuntu.rst b/doc/source/install/compute-install-ubuntu.rst index 4c091435..ab970f78 100644 --- a/doc/source/install/compute-install-ubuntu.rst +++ b/doc/source/install/compute-install-ubuntu.rst @@ -41,7 +41,7 @@ Install and configure components # apt-get install python3-pip # cd /var/lib/kuryr - # git clone -b master https://git.openstack.org/openstack/kuryr-libnetwork.git + # git clone -b master https://opendev.org/openstack/kuryr-libnetwork.git # chown -R kuryr:kuryr kuryr-libnetwork # cd kuryr-libnetwork # pip3 install -r requirements.txt diff --git a/tox.ini b/tox.ini index 8f902ca6..32907c4c 100644 --- a/tox.ini +++ b/tox.ini @@ -12,7 +12,7 @@ setenv = VIRTUAL_ENV={envdir} PYTHONWARNINGS=default::DeprecationWarning usedevelop = True 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://releases.openstack.org/constraints/upper/master} {opts} {packages} deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt whitelist_externals = sh