From 1ebb081e8fad5056a74469d1d8b1b3df6b6edfdd Mon Sep 17 00:00:00 2001 From: caoyuan Date: Tue, 23 Apr 2019 19:40:04 +0800 Subject: [PATCH] Replace git.openstack.org URLs with opendev.org URLs Change-Id: I6c273be62735d46221130a1da4d3672fdea77e01 --- CONTRIBUTING.rst | 6 ++--- README.rst | 6 ++--- devstack/local.conf.example | 14 +++++------ devstack/local.conf.kubernetes | 20 ++++++++-------- devstack/local.conf.standalone | 2 +- devstack/settings | 2 +- doc/source/contributor/api_layer.rst | 10 ++++---- doc/source/contributor/dashboards.rst | 2 +- .../contributor/development.environment.rst | 4 ++-- .../encrypt_vim_auth_with_barbican.rst | 4 ++-- doc/source/index.rst | 8 +++---- doc/source/install/devstack.rst | 24 +++++++++---------- .../install/kubernetes_vim_installation.rst | 6 ++--- .../user/alarm_monitoring_usage_guide.rst | 4 ++-- tools/vnfc/build_image.sh | 4 ++-- tox.ini | 2 +- 16 files changed, 59 insertions(+), 59 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 7ab78fee4..11ee0a11e 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -46,9 +46,9 @@ Source Repository The official Tacker source code is available in following repositories: -* **Tacker server:** https://git.openstack.org/cgit/openstack/tacker -* **Tacker Python client:** https://git.openstack.org/cgit/openstack/python-tackerclient -* **Tacker Horizon UI:** https://git.openstack.org/cgit/openstack/tacker-horizon +* **Tacker server:** https://opendev.org/openstack/tacker +* **Tacker Python client:** https://opendev.org/openstack/python-tackerclient +* **Tacker Horizon UI:** https://opendev.org/openstack/tacker-horizon The mirror repositories on Github: diff --git a/README.rst b/README.rst index 63455fdd9..54c3ec65a 100644 --- a/README.rst +++ b/README.rst @@ -30,9 +30,9 @@ Code: Tacker code is available in following repositories: -* **Tacker server:** https://git.openstack.org/cgit/openstack/tacker -* **Tacker Python client:** https://git.openstack.org/cgit/openstack/python-tackerclient -* **Tacker Horizon UI:** https://git.openstack.org/cgit/openstack/tacker-horizon +* **Tacker server:** https://opendev.org/openstack/tacker +* **Tacker Python client:** https://opendev.org/openstack/python-tackerclient +* **Tacker Horizon UI:** https://opendev.org/openstack/tacker-horizon Bugs: ===== diff --git a/devstack/local.conf.example b/devstack/local.conf.example index f988cda9c..76859f15c 100644 --- a/devstack/local.conf.example +++ b/devstack/local.conf.example @@ -36,18 +36,18 @@ Q_USE_SECGROUP=False LIBVIRT_FIREWALL_DRIVER=nova.virt.firewall.NoopFirewallDriver # Enable heat, networking-sfc, barbican and mistral -enable_plugin heat https://git.openstack.org/openstack/heat master -enable_plugin networking-sfc https://git.openstack.org/openstack/networking-sfc master -enable_plugin barbican https://git.openstack.org/openstack/barbican master -enable_plugin mistral https://git.openstack.org/openstack/mistral master +enable_plugin heat https://opendev.org/openstack/heat master +enable_plugin networking-sfc https://opendev.org/openstack/networking-sfc master +enable_plugin barbican https://opendev.org/openstack/barbican master +enable_plugin mistral https://opendev.org/openstack/mistral master # Ceilometer #CEILOMETER_PIPELINE_INTERVAL=300 -enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer master -enable_plugin aodh https://git.openstack.org/openstack/aodh master +enable_plugin ceilometer https://opendev.org/openstack/ceilometer master +enable_plugin aodh https://opendev.org/openstack/aodh master # Tacker -enable_plugin tacker https://git.openstack.org/openstack/tacker master +enable_plugin tacker https://opendev.org/openstack/tacker master enable_service n-novnc enable_service n-cauth diff --git a/devstack/local.conf.kubernetes b/devstack/local.conf.kubernetes index 18b0d0685..c051e1939 100644 --- a/devstack/local.conf.kubernetes +++ b/devstack/local.conf.kubernetes @@ -36,18 +36,18 @@ Q_USE_SECGROUP=False LIBVIRT_FIREWALL_DRIVER=nova.virt.firewall.NoopFirewallDriver # Enable heat, networking-sfc, barbican and mistral -enable_plugin heat https://git.openstack.org/openstack/heat master -enable_plugin networking-sfc https://git.openstack.org/openstack/networking-sfc master -enable_plugin barbican https://git.openstack.org/openstack/barbican master -enable_plugin mistral https://git.openstack.org/openstack/mistral master +enable_plugin heat https://opendev.org/openstack/heat master +enable_plugin networking-sfc https://opendev.org/openstack/networking-sfc master +enable_plugin barbican https://opendev.org/openstack/barbican master +enable_plugin mistral https://opendev.org/openstack/mistral master # Ceilometer #CEILOMETER_PIPELINE_INTERVAL=300 -enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer master -enable_plugin aodh https://git.openstack.org/openstack/aodh master +enable_plugin ceilometer https://opendev.org/openstack/ceilometer master +enable_plugin aodh https://opendev.org/openstack/aodh master # Tacker -enable_plugin tacker https://git.openstack.org/openstack/tacker master +enable_plugin tacker https://opendev.org/openstack/tacker master enable_service n-novnc enable_service n-cauth @@ -56,9 +56,9 @@ disable_service tempest # Enable kuryr-kubernetes, docker, octavia KUBERNETES_VIM=True -enable_plugin kuryr-kubernetes https://git.openstack.org/openstack/kuryr-kubernetes master -enable_plugin octavia https://git.openstack.org/openstack/octavia master -enable_plugin devstack-plugin-container https://git.openstack.org/openstack/devstack-plugin-container master +enable_plugin kuryr-kubernetes https://opendev.org/openstack/kuryr-kubernetes master +enable_plugin octavia https://opendev.org/openstack/octavia master +enable_plugin devstack-plugin-container https://opendev.org/openstack/devstack-plugin-container master #KURYR_K8S_CLUSTER_IP_RANGE="10.0.0.0/24" [[post-config|/etc/neutron/dhcp_agent.ini]] diff --git a/devstack/local.conf.standalone b/devstack/local.conf.standalone index 463685aae..e2c50d24f 100644 --- a/devstack/local.conf.standalone +++ b/devstack/local.conf.standalone @@ -17,7 +17,7 @@ LOGFILE=$DEST/logs/stack.sh.log VERBOSE=True ENABLE_DEBUG_LOG_LEVEL=True ENABLE_VERBOSE_LOG_LEVEL=True -GIT_BASE=${GIT_BASE:-https://git.openstack.org} +GIT_BASE=${GIT_BASE:-https://opendev.org} TACKER_MODE=standalone USE_BARBICAN=True diff --git a/devstack/settings b/devstack/settings index fdbd8b47c..e7564676b 100644 --- a/devstack/settings +++ b/devstack/settings @@ -23,7 +23,7 @@ if [ "${TACKER_MODE}" == "all" ]; then enable_service tacker-conductor MGMT_PHYS_NET=${MGMT_PHYS_NET:-mgmtphysnet0} # br-infra is created by devstack multi node job - # http://git.openstack.org/cgit/openstack-infra/zuul-jobs/tree/roles/multi-node-bridge + # https://opendev.org/zuul/zuul-jobs/src/branch/master/roles/multi-node-bridge BR_MGMT=${BR_MGMT:-br-infra} NET_MGMT=${NET_MGMT:-net_mgmt} SUBNET_MGMT=${SUBNET_MGMT:-subnet_mgmt} diff --git a/doc/source/contributor/api_layer.rst b/doc/source/contributor/api_layer.rst index ace03c5e2..e448e6b70 100644 --- a/doc/source/contributor/api_layer.rst +++ b/doc/source/contributor/api_layer.rst @@ -10,14 +10,14 @@ Server Gateway Interface (WSGI) - defined in `PEP 333 `_ +Tackers's WSGI server is started from the `server module `_ and the entry point `serve_wsgi` is called to build an instance of the `TackerApiService`_, which is then returned to the server module, which spawns a `Eventlet`_ `GreenPool`_ that will run the WSGI application and respond to requests from clients. -.. _TackerApiService: https://git.openstack.org/cgit/openstack/tacker/tree/tacker/service.py +.. _TackerApiService: https://opendev.org/openstack/tacker/tree/tacker/service.py .. _Eventlet: https://eventlet.net/ @@ -39,11 +39,11 @@ Tacker, which contains several methods that map VNFM resources (such as vnfd, vnf) to URLs, and the controller for each resource. -.. _config.py: http://git.openstack.org/cgit/openstack/tacker/tree/tacker/common/config.py +.. _config.py: http://opendev.org/openstack/tacker/tree/tacker/common/config.py -.. _api-paste.ini: http://git.openstack.org/cgit/openstack/tacker/tree/etc/tacker/api-paste.ini +.. _api-paste.ini: http://opendev.org/openstack/tacker/tree/etc/tacker/api-paste.ini -.. _APIRouter: https://git.openstack.org/cgit/openstack/tacker/tree/tacker/api/v1/router.py +.. _APIRouter: https://opendev.org/openstack/tacker/tree/tacker/api/v1/router.py .. _Paste: http://pythonpaste.org/ diff --git a/doc/source/contributor/dashboards.rst b/doc/source/contributor/dashboards.rst index 7974a6f0b..4c845c356 100644 --- a/doc/source/contributor/dashboards.rst +++ b/doc/source/contributor/dashboards.rst @@ -4,7 +4,7 @@ Gerrit Dashboards Gerrit Dashboard Creator creates custom URLs for Gerrit dashboards. It helps reviewer easily to look the reviews. -- `Tacker master branch reviews `_ +- `Tacker master branch reviews `_ These dashboard links can be generated by `Gerrit Dashboard Creator`_. Useful dashboard definitions are found in ``dashboards`` directory. diff --git a/doc/source/contributor/development.environment.rst b/doc/source/contributor/development.environment.rst index cf9e53f95..bee979c12 100644 --- a/doc/source/contributor/development.environment.rst +++ b/doc/source/contributor/development.environment.rst @@ -33,7 +33,7 @@ If you want to be able to run Tacker in a full OpenStack environment, you can use the excellent `DevStack`_ project to do so. There is a wiki page that describes `setting up Tacker using DevStack`_. -.. _DevStack: https://git.openstack.org/cgit/openstack-dev/devstack +.. _DevStack: https://opendev.org/openstack/devstack .. _setting up Tacker using Devstack: https://docs.openstack.org/tacker/latest/install/devstack.html Getting the code @@ -41,7 +41,7 @@ Getting the code Grab the code:: - git clone https://git.openstack.org/openstack/tacker.git + git clone https://opendev.org/openstack/tacker.git cd tacker diff --git a/doc/source/contributor/encrypt_vim_auth_with_barbican.rst b/doc/source/contributor/encrypt_vim_auth_with_barbican.rst index 1db211244..4946f020e 100644 --- a/doc/source/contributor/encrypt_vim_auth_with_barbican.rst +++ b/doc/source/contributor/encrypt_vim_auth_with_barbican.rst @@ -49,8 +49,8 @@ We need enable barbican in devstack localrc file: .. code-block:: bash - enable_plugin barbican https://git.openstack.org/openstack/barbican - enable_plugin tacker https://git.openstack.org/openstack/tacker + enable_plugin barbican https://opendev.org/openstack/barbican + enable_plugin tacker https://opendev.org/openstack/tacker USE_BARBICAN=True .. note:: diff --git a/doc/source/index.rst b/doc/source/index.rst index 4f69a94c8..ba225c83c 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -49,11 +49,11 @@ Project Info ------------ * **Free software:** under the `Apache license `_ -* **Tacker Service:** https://git.openstack.org/cgit/openstack/tacker -* **Tacker Horizon:** https://git.openstack.org/cgit/openstack/tacker-horizon -* **Tacker Specs:** https://git.openstack.org/cgit/openstack/tacker-specs +* **Tacker Service:** https://opendev.org/openstack/tacker +* **Tacker Horizon:** https://opendev.org/openstack/tacker-horizon +* **Tacker Specs:** https://opendev.org/openstack/tacker-specs * **Tacker Specs Documentation:** https://specs.openstack.org/openstack/tacker-specs -* **Tacker Client Library:** https://git.openstack.org/cgit/openstack/python-tackerclient +* **Tacker Client Library:** https://opendev.org/openstack/python-tackerclient * **Tacker Bugs:** https://bugs.launchpad.net/tacker * **Client Bugs:** https://bugs.launchpad.net/python-tackerclient * **Blueprints:** https://blueprints.launchpad.net/tacker diff --git a/doc/source/install/devstack.rst b/doc/source/install/devstack.rst index 4adaaba83..f2eba185a 100644 --- a/doc/source/install/devstack.rst +++ b/doc/source/install/devstack.rst @@ -31,7 +31,7 @@ separate user and granting relevant privileges please refer [#f0]_. .. code-block:: console - $ git clone https://git.openstack.org/openstack-dev/devstack -b + $ git clone https://opendev.org/openstack-dev/devstack -b $ cd devstack .. @@ -89,21 +89,21 @@ The **local.conf** file of all-in-one mode from [#f2]_ is shown as below: LIBVIRT_FIREWALL_DRIVER=nova.virt.firewall.NoopFirewallDriver # Enable heat, networking-sfc, barbican and mistral - enable_plugin heat https://git.openstack.org/openstack/heat master - enable_plugin networking-sfc https://git.openstack.org/openstack/networking-sfc master - enable_plugin barbican https://git.openstack.org/openstack/barbican master - enable_plugin mistral https://git.openstack.org/openstack/mistral master + enable_plugin heat https://opendev.org/openstack/heat master + enable_plugin networking-sfc https://opendev.org/openstack/networking-sfc master + enable_plugin barbican https://opendev.org/openstack/barbican master + enable_plugin mistral https://opendev.org/openstack/mistral master # Ceilometer #CEILOMETER_PIPELINE_INTERVAL=300 - enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer master - enable_plugin aodh https://git.openstack.org/openstack/aodh master + enable_plugin ceilometer https://opendev.org/openstack/ceilometer master + enable_plugin aodh https://opendev.org/openstack/aodh master # Blazar enable_plugin blazar https://github.com/openstack/blazar.git master # Tacker - enable_plugin tacker https://git.openstack.org/openstack/tacker master + enable_plugin tacker https://opendev.org/openstack/tacker master enable_service n-novnc enable_service n-cauth @@ -113,9 +113,9 @@ The **local.conf** file of all-in-one mode from [#f2]_ is shown as below: # Enable Kubernetes and kuryr-kubernetes KUBERNETES_VIM=True NEUTRON_CREATE_INITIAL_NETWORKS=False - enable_plugin kuryr-kubernetes https://git.openstack.org/openstack/kuryr-kubernetes master - enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas master - enable_plugin devstack-plugin-container https://git.openstack.org/openstack/devstack-plugin-container master + enable_plugin kuryr-kubernetes https://opendev.org/openstack/kuryr-kubernetes master + enable_plugin neutron-lbaas https://opendev.org/openstack/neutron-lbaas master + enable_plugin devstack-plugin-container https://opendev.org/openstack/devstack-plugin-container master [[post-config|/etc/neutron/dhcp_agent.ini]] [DEFAULT] @@ -149,7 +149,7 @@ The **local.conf** file of standalone mode from [#f3]_ is shown as below: VERBOSE=True ENABLE_DEBUG_LOG_LEVEL=True ENABLE_VERBOSE_LOG_LEVEL=True - GIT_BASE=${GIT_BASE:-https://git.openstack.org} + GIT_BASE=${GIT_BASE:-https://opendev.org} TACKER_MODE=standalone USE_BARBICAN=True diff --git a/doc/source/install/kubernetes_vim_installation.rst b/doc/source/install/kubernetes_vim_installation.rst index 6bb08b418..c4a5c9bc3 100644 --- a/doc/source/install/kubernetes_vim_installation.rst +++ b/doc/source/install/kubernetes_vim_installation.rst @@ -33,9 +33,9 @@ bring VMs and Pods (and other Kubernetes resources) on the same network. # Enable kuryr-kubernetes, docker, octavia KUBERNETES_VIM=True - enable_plugin kuryr-kubernetes https://git.openstack.org/openstack/kuryr-kubernetes master - enable_plugin octavia https://git.openstack.org/openstack/octavia master - enable_plugin devstack-plugin-container https://git.openstack.org/openstack/devstack-plugin-container master + enable_plugin kuryr-kubernetes https://opendev.org/openstack/kuryr-kubernetes master + enable_plugin octavia https://opendev.org/openstack/octavia master + enable_plugin devstack-plugin-container https://opendev.org/openstack/devstack-plugin-container master KURYR_K8S_CLUSTER_IP_RANGE="10.0.0.0/24" The public network will be used to launched LoadBalancer for Services in diff --git a/doc/source/user/alarm_monitoring_usage_guide.rst b/doc/source/user/alarm_monitoring_usage_guide.rst index ac8e40e3a..b4efe1556 100644 --- a/doc/source/user/alarm_monitoring_usage_guide.rst +++ b/doc/source/user/alarm_monitoring_usage_guide.rst @@ -157,9 +157,9 @@ Ceilometer and Aodh plugins will need to be enabled in local.conf: .. code-block::ini -**enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer master** +**enable_plugin ceilometer https://opendev.org/openstack/ceilometer master** -**enable_plugin aodh https://git.openstack.org/openstack/aodh master** +**enable_plugin aodh https://opendev.org/openstack/aodh master** How to monitor VNFs via alarm triggers ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tools/vnfc/build_image.sh b/tools/vnfc/build_image.sh index 8cf8a9868..d2f871935 100755 --- a/tools/vnfc/build_image.sh +++ b/tools/vnfc/build_image.sh @@ -8,8 +8,8 @@ pip install diskimage-builder pip install dib-utils CURRENT_DIR=`pwd` cd $VNFC_IMAGE -git clone https://git.openstack.org/openstack/tripleo-image-elements.git -git clone https://git.openstack.org/openstack/heat-templates.git +git clone https://opendev.org/openstack/tripleo-image-elements.git +git clone https://opendev.org/openstack/heat-templates.git export ELEMENTS_PATH=tripleo-image-elements/elements:heat-templates/hot/software-config/elements disk-image-create vm \ diff --git a/tox.ini b/tox.ini index 77446717c..c538487bc 100644 --- a/tox.ini +++ b/tox.ini @@ -13,7 +13,7 @@ passenv = UPPER_CONSTRAINTS_FILE usedevelop = True whitelist_externals = rm 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} deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands =