diff --git a/README.rst b/README.rst index 0b08981ffc..fc934430e1 100644 --- a/README.rst +++ b/README.rst @@ -23,7 +23,7 @@ Getting Started If you'd like to run from the master branch, you can clone the git repo: - git clone https://git.openstack.org/openstack/manila.git + git clone https://opendev.org/openstack/manila For developer information please see `HACKING.rst `_ @@ -33,7 +33,7 @@ You can raise bugs here https://bugs.launchpad.net/manila Python client ------------- -https://opendev.org/openstack/python-manilaclient.git +https://opendev.org/openstack/python-manilaclient * Documentation for the project can be found at: diff --git a/devstack/README.rst b/devstack/README.rst index 34b755d13d..b4f8b68551 100644 --- a/devstack/README.rst +++ b/devstack/README.rst @@ -13,10 +13,10 @@ quickstart reference: > cat local.conf [[local|localrc]] # Enable manila - enable_plugin manila https://git.openstack.org/openstack/manila + enable_plugin manila https://opendev.org/openstack/manila # Enable manila ui in the dashboard - enable_plugin manila-ui https://git.openstack.org/openstack/manila-ui + enable_plugin manila-ui https://opendev.org/openstack/manila-ui 3. run ``stack.sh`` diff --git a/devstack/plugin.sh b/devstack/plugin.sh index de1a1aab7a..0ca19f8eea 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -903,7 +903,7 @@ function stop_manila { } function install_manila_tempest_plugin { - MANILA_TEMPEST_PLUGIN_REPO=${MANILA_TEMPEST_PLUGIN_REPO:-${GIT_BASE}/openstack/manila-tempest-plugin.git} + MANILA_TEMPEST_PLUGIN_REPO=${MANILA_TEMPEST_PLUGIN_REPO:-${GIT_BASE}/openstack/manila-tempest-plugin} MANILA_TEMPEST_PLUGIN_BRANCH=${MANILA_TEMPEST_PLUGIN_BRANCH:-master} MANILA_TEMPEST_PLUGIN_DIR=$DEST/manila-tempest-plugin @@ -1228,7 +1228,7 @@ elif [[ "$1" == "stack" && "$2" == "extra" ]]; then create_custom_share_types echo_summary "Manila UI is no longer enabled by default. \ - Add enable_plugin manila-ui https://git.openstack.org/openstack/manila-ui \ + Add enable_plugin manila-ui https://opendev.org/openstack/manila-ui \ to your local.conf file to enable Manila UI" elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then diff --git a/devstack/settings b/devstack/settings index 305e43d48c..b8ce551c3c 100644 --- a/devstack/settings +++ b/devstack/settings @@ -30,10 +30,10 @@ # Defaults # -------- -MANILA_GIT_BASE=${MANILA_GIT_BASE:-https://git.openstack.org} +MANILA_GIT_BASE=${MANILA_GIT_BASE:-https://opendev.org} MANILA_REPO_ROOT=${MANILA_REPO_ROOT:-openstack} -MANILACLIENT_REPO=${MANILA_GIT_BASE}/${MANILA_REPO_ROOT}/python-manilaclient.git +MANILACLIENT_REPO=${MANILA_GIT_BASE}/${MANILA_REPO_ROOT}/python-manilaclient MANILACLIENT_BRANCH=${MANILACLIENT_BRANCH:-master} # Set up default directories diff --git a/devstack/upgrade/settings b/devstack/upgrade/settings index 6bbb86ea56..2545cf7bf5 100644 --- a/devstack/upgrade/settings +++ b/devstack/upgrade/settings @@ -10,7 +10,7 @@ export PYTHON3_VERSION=${PYTHON3_VERSION} devstack_localrc base enable_service manila m-api m-shr m-sch m-dat -devstack_localrc base enable_plugin manila https://git.openstack.org/openstack/manila stable/stein +devstack_localrc base enable_plugin manila https://opendev.org/openstack/manila stable/stein devstack_localrc base MANILA_UI_ENABLED=False devstack_localrc base OSLO_SERVICE_WORKS=True @@ -19,7 +19,7 @@ devstack_localrc base OSLO_SERVICE_WORKS=True devstack_localrc base MANILACLIENT_BRANCH="stable/stein" devstack_localrc target enable_service manila m-api m-shr m-sch m-dat -devstack_localrc target enable_plugin manila https://git.openstack.org/openstack/manila +devstack_localrc target enable_plugin manila https://opendev.org/openstack/manila devstack_localrc target MANILA_UI_ENABLED=False devstack_localrc target OSLO_SERVICE_WORKS=True devstack_localrc target MANILA_USE_DOWNGRADE_MIGRATIONS=False diff --git a/doc/source/admin/container_driver.rst b/doc/source/admin/container_driver.rst index 58c6903eca..b253134278 100644 --- a/doc/source/admin/container_driver.rst +++ b/doc/source/admin/container_driver.rst @@ -60,7 +60,7 @@ local.conf: .. code-block:: ini - enable_plugin manila https://git.openstack.org/openstack/manila + enable_plugin manila https://opendev.org/openstack/manila MANILA_BACKEND1_CONFIG_GROUP_NAME=london MANILA_SHARE_BACKEND1_NAME=LONDON MANILA_OPTGROUP_london_driver_handles_share_servers=True diff --git a/doc/source/configuration/shared-file-systems/drivers.rst b/doc/source/configuration/shared-file-systems/drivers.rst index cdb040106a..0272aa213c 100644 --- a/doc/source/configuration/shared-file-systems/drivers.rst +++ b/doc/source/configuration/shared-file-systems/drivers.rst @@ -68,4 +68,4 @@ The configuration for all of them follows a common paradigm: # ... The share drivers are included in the `Shared File Systems repository -`_. +`_. diff --git a/doc/source/contributor/architecture.rst b/doc/source/contributor/architecture.rst index 1ff19be823..4bf7265dc3 100644 --- a/doc/source/contributor/architecture.rst +++ b/doc/source/contributor/architecture.rst @@ -49,7 +49,7 @@ Below you will a brief explanation of the different components. * DB: sql database for data storage. Used by all components (LINKS NOT SHOWN) * Web Dashboard: external component that talks to the api, implemented as a plugin to the OpenStack Dashboard (Horizon) project, source - is `here `_. + is `here `_. * :term:`manila-api` * Auth Manager: component responsible for users/projects/and roles. Can backend to DB or LDAP. This is not a separate binary, but rather a python class that is used by most components in the system. * :term:`manila-scheduler` diff --git a/doc/source/contributor/development-environment-devstack.rst b/doc/source/contributor/development-environment-devstack.rst index 6ed6f8783b..0f94021480 100644 --- a/doc/source/contributor/development-environment-devstack.rst +++ b/doc/source/contributor/development-environment-devstack.rst @@ -44,7 +44,7 @@ Getting devstack Start by cloning the devstack repository:: - git clone https://opendev.org/openstack/devstack.git + git clone https://opendev.org/openstack/devstack Change to devstack directory:: @@ -158,20 +158,20 @@ Testing branches and changes submitted for review To test a patch in review:: - enable_plugin manila https://git.openstack.org/openstack/manila + enable_plugin manila https://opendev.org/openstack/manila -If the ref is from review.openstack.org, it is structured as:: +If the ref is from review.opendev.org, it is structured as:: refs/changes/// -For example, if you want to test patchset 4 of https://review.openstack.org/#/c/614170/, +For example, if you want to test patchset 4 of https://review.opendev.org/#/c/614170/, you can provide this in your ``local.conf``:: - enable_plugin manila https://git.openstack.org/openstack/manila refs/changes/70/614170/4 + enable_plugin manila https://opendev.org/openstack/manila refs/changes/70/614170/4 ref can also simply be a stable branch name, for example:: - enable_plugin manila https://git.openstack.org/openstack/manila stable/rocky + enable_plugin manila https://opendev.org/openstack/manila stable/train Limiting the services enabled in your stack ```````````````````````````````````````````` diff --git a/doc/source/contributor/development.environment.rst b/doc/source/contributor/development.environment.rst index 26fb930e3c..807ea01c6d 100644 --- a/doc/source/contributor/development.environment.rst +++ b/doc/source/contributor/development.environment.rst @@ -115,7 +115,7 @@ Getting the code ---------------- Grab the code:: - git clone https://git.openstack.org/openstack/manila.git + git clone https://opendev.org/openstack/manila cd manila diff --git a/doc/source/contributor/documenting_your_work.rst b/doc/source/contributor/documenting_your_work.rst index ad1dc4fa7d..a31bcac1f5 100644 --- a/doc/source/contributor/documenting_your_work.rst +++ b/doc/source/contributor/documenting_your_work.rst @@ -77,7 +77,7 @@ OpenStack API Reference - For releases prior to Newton, the API reference was maintained in `Web Application Description Language (WADL) `_ in - the `api-site `_ project. + the `api-site `_ project. - Since the Newton release, manila's API reference is maintained in-tree in custom YAML/JSON format files. - **Link**: `REST API reference of the Shared File Systems Project v2.0 @@ -110,7 +110,7 @@ OpenStack Security Guide information needs to be documented here. - **Link**: `Security guide `_ - **Repository**: The security guide is maintained within the - `OpenStack Security-doc project `_ + `OpenStack Security-doc project `_ OpenStack Command Line Reference diff --git a/doc/source/contributor/gerrit.rst b/doc/source/contributor/gerrit.rst index e1e721613d..45a39158ad 100644 --- a/doc/source/contributor/gerrit.rst +++ b/doc/source/contributor/gerrit.rst @@ -4,7 +4,7 @@ Code Reviews with Gerrit ======================== Manila uses the `Gerrit`_ tool to review proposed code changes. The review site -is https://review.openstack.org. +is https://review.opendev.org. Gerrit is a complete replacement for Github pull requests. `All Github pull requests to the manila repository will be ignored`. diff --git a/doc/source/contributor/manila-review-policy.rst b/doc/source/contributor/manila-review-policy.rst index 5c681b8453..bfa86f62ad 100644 --- a/doc/source/contributor/manila-review-policy.rst +++ b/doc/source/contributor/manila-review-policy.rst @@ -8,14 +8,14 @@ Peer code review and the OpenStack Way Manila adheres to the `OpenStack code review policy and guidelines `_. -Similar to other projects hosted on `git.openstack.org `_, all of manila's code is curated and maintained by a small +Similar to other projects hosted on `opendev.org `_, all +of manila's code is curated and maintained by a small group of individuals called the "core team". The `primary core team -`_ +`_ consists of members from diverse affiliations. There are special core teams -such as the `manila release core team `_ and the `manila stable maintenance core -team `_ that +team `_ that have specific roles as the names suggest. To make a code change in openstack/manila or any of the associated code @@ -23,9 +23,9 @@ repositories (openstack/manila-image-elements, openstack/manila-specs, openstack/manila-tempest-plugin, openstack/manila-test-image, openstack/manila-ui and openstack/python-manilaclient), contributors need to follow the :ref:`Code Submission Process ` and -upload their code on the `OpenStack Gerrit `_ +upload their code on the `OpenStack Gerrit `_ website. They can then seek reviews by adding individual members of the -`manila core team `_ or alert the entire core team by inviting the Gerrit group "manila-core" to the review. Anyone with a membership to the OpenStack Gerrit system may review the code change. However, only the core team can @@ -104,4 +104,4 @@ References .. [#] Getting started with IRC: https://docs.openstack.org/contributors/common/irc.html .. [#] IRC guidelines: https://docs.openstack.org/infra/manual/irc.html .. [#] TC Report 18-28: https://anticdent.org/tc-report-18-28.html -.. [#] TC vote to remove team diversity tags: https://review.openstack.org/#/c/579870/ +.. [#] TC vote to remove team diversity tags: https://review.opendev.org/#/c/579870/ diff --git a/doc/source/contributor/samples/cephfs_local.conf b/doc/source/contributor/samples/cephfs_local.conf index 189cfebb56..d25e7137e6 100644 --- a/doc/source/contributor/samples/cephfs_local.conf +++ b/doc/source/contributor/samples/cephfs_local.conf @@ -18,13 +18,13 @@ LOGFILE=/opt/stack/devstacklog.txt # Enabling manila services LIBS_FROM_GIT=python-manilaclient -enable_plugin manila https://git.openstack.org/openstack/manila -enable_plugin manila-ui https://github.com/openstack/manila-ui -enable_plugin manila-tempest-plugin https://git.openstack.org/openstack/manila-tempest-plugin +enable_plugin manila https://opendev.org/openstack/manila +enable_plugin manila-ui https://opendev.org/openstack/manila-ui +enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin # Enabling ceph -enable_plugin devstack-plugin-ceph https://git.openstack.org/openstack/devstack-plugin-ceph +enable_plugin devstack-plugin-ceph https://opendev.org/openstack/devstack-plugin-ceph ENABLE_CEPH_MANILA=True diff --git a/doc/source/contributor/samples/container_local.conf b/doc/source/contributor/samples/container_local.conf index 66ab39b569..c892e17211 100644 --- a/doc/source/contributor/samples/container_local.conf +++ b/doc/source/contributor/samples/container_local.conf @@ -16,9 +16,9 @@ LOGFILE=/opt/stack/devstacklog.txt # Enabling manila services LIBS_FROM_GIT=python-manilaclient -enable_plugin manila https://git.openstack.org/openstack/manila -enable_plugin manila-ui https://github.com/openstack/manila-ui -enable_plugin manila-tempest-plugin https://git.openstack.org/openstack/manila-tempest-plugin +enable_plugin manila https://opendev.org/openstack/manila +enable_plugin manila-ui https://opendev.org/openstack/manila-ui +enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin # Container Backend config options diff --git a/doc/source/contributor/samples/generic_local.conf b/doc/source/contributor/samples/generic_local.conf index 3a7327fb5f..0a2cbe9a50 100644 --- a/doc/source/contributor/samples/generic_local.conf +++ b/doc/source/contributor/samples/generic_local.conf @@ -17,9 +17,9 @@ LOGFILE=/opt/stack/devstacklog.txt # Enabling manila services LIBS_FROM_GIT=python-manilaclient -enable_plugin manila https://git.openstack.org/openstack/manila -enable_plugin manila-ui https://github.com/openstack/manila-ui -enable_plugin manila-tempest-plugin https://git.openstack.org/openstack/manila-tempest-plugin +enable_plugin manila https://opendev.org/openstack/manila +enable_plugin manila-ui https://opendev.org/openstack/manila-ui +enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin # Generic Back end config options diff --git a/doc/source/contributor/samples/lvm_local.conf b/doc/source/contributor/samples/lvm_local.conf index 342d852c56..a61785a6b4 100644 --- a/doc/source/contributor/samples/lvm_local.conf +++ b/doc/source/contributor/samples/lvm_local.conf @@ -16,9 +16,9 @@ LOGFILE=/opt/stack/devstacklog.txt # Enabling manila services LIBS_FROM_GIT=python-manilaclient -enable_plugin manila https://git.openstack.org/openstack/manila -enable_plugin manila-ui https://github.com/openstack/manila-ui -enable_plugin manila-tempest-plugin https://git.openstack.org/openstack/manila-tempest-plugin +enable_plugin manila https://opendev.org/openstack/manila +enable_plugin manila-ui https://opendev.org/openstack/manila-ui +enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin # LVM Backend config options diff --git a/doc/source/contributor/samples/zfsonlinux_local.conf b/doc/source/contributor/samples/zfsonlinux_local.conf index 076a17c22c..db8db895e6 100644 --- a/doc/source/contributor/samples/zfsonlinux_local.conf +++ b/doc/source/contributor/samples/zfsonlinux_local.conf @@ -16,9 +16,9 @@ LOGFILE=/opt/stack/devstacklog.txt # Enabling manila services LIBS_FROM_GIT=python-manilaclient -enable_plugin manila https://git.openstack.org/openstack/manila -enable_plugin manila-ui https://github.com/openstack/manila-ui -enable_plugin manila-tempest-plugin https://git.openstack.org/openstack/manila-tempest-plugin +enable_plugin manila https://opendev.org/openstack/manila +enable_plugin manila-ui https://opendev.org/openstack/manila-ui +enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin # ZfsOnLinux Back end config options diff --git a/doc/source/contributor/tempest_tests.rst b/doc/source/contributor/tempest_tests.rst index 65255add52..25da7ee86b 100644 --- a/doc/source/contributor/tempest_tests.rst +++ b/doc/source/contributor/tempest_tests.rst @@ -16,7 +16,7 @@ you can clone and install it yourself. .. code-block:: console - $ git clone https://git.openstack.org/openstack/manila-tempest-plugin + $ git clone https://opendev.org/openstack/manila-tempest-plugin $ pip install -e manila-tempest-plugin .. _docs: https://docs.openstack.org/tempest/latest/plugin.html#using-plugins diff --git a/tools/check_logging.sh b/tools/check_logging.sh index 6632dda82e..8dbb5bfb8f 100755 --- a/tools/check_logging.sh +++ b/tools/check_logging.sh @@ -18,11 +18,7 @@ if [[ count -eq 0 ]]; then exit 0 fi -echo 'Found files with unused LOG variable (see https://review.openstack.org/#/c/301054):' +echo 'Found files with unused LOG variable (see https://review.opendev.org/#/c/301054):' cat $tmpfile rm $tmpfile exit 1 - - - - diff --git a/tox.ini b/tox.ini index b3bac731d1..6cf0221bb2 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,7 @@ envlist = py3,pep8 basepython = python3 setenv = VIRTUAL_ENV={envdir} usedevelop = True -install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} +install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages} whitelist_externals = find deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt @@ -18,7 +18,7 @@ commands = [testenv:releasenotes] deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} + -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/doc/requirements.txt commands = rm -rf releasenotes/build @@ -63,7 +63,7 @@ commands = {posargs} [testenv:docs] deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} + -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/requirements.txt -r{toxinidir}/doc/requirements.txt commands =