From e02a625e9c13cf025814ec49b4acd457310cfabe Mon Sep 17 00:00:00 2001 From: Luigi Toscano Date: Mon, 17 Dec 2018 13:56:17 +0100 Subject: [PATCH] Use the canonical URL for Manila repositories - When the URL refers to cloning or using git repositories, use the cloning URL (https://git.openstack.org/openstack/) - When the URL refers to the browsable version of the repository, use the cgit frontend (https://git.openstack.org/cgit/openstack/) Change-Id: I11a8e15c6d663786465c090b40db9e20b19194e6 --- README.rst | 6 +++--- devstack/README.rst | 2 +- devstack/plugin.sh | 2 +- devstack/settings | 2 +- doc/source/contributor/architecture.rst | 2 +- doc/source/contributor/development-environment-devstack.rst | 6 +++--- doc/source/contributor/development.environment.rst | 2 +- doc/source/contributor/documenting_your_work.rst | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.rst b/README.rst index ba75aafd68..3e02e9def0 100644 --- a/README.rst +++ b/README.rst @@ -23,17 +23,17 @@ Getting Started If you'd like to run from the master branch, you can clone the git repo: - git clone https://github.com/openstack/manila.git + git clone https://git.openstack.org/openstack/manila.git For developer information please see -`HACKING.rst `_ +`HACKING.rst `_ You can raise bugs here https://bugs.launchpad.net/manila Python client ------------- -https://github.com/openstack/python-manilaclient.git +https://git.openstack.org/cgit/openstack/python-manilaclient.git * Release notes for the project can be found at: diff --git a/devstack/README.rst b/devstack/README.rst index bd808a1d20..be0d6a4936 100644 --- a/devstack/README.rst +++ b/devstack/README.rst @@ -8,6 +8,6 @@ > cat local.conf [[local|localrc]] - enable_plugin manila https://github.com/openstack/manila + enable_plugin manila https://git.openstack.org/openstack/manila 3. run ``stack.sh`` diff --git a/devstack/plugin.sh b/devstack/plugin.sh index f4e80be8e2..c78756e38a 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -1155,7 +1155,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 github.com/openstack/manila-ui \ + Add enable_plugin manila-ui https://git.openstack.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 eb2a871c30..d0e6fcdf1c 100644 --- a/devstack/settings +++ b/devstack/settings @@ -30,7 +30,7 @@ # Defaults # -------- -MANILA_GIT_BASE=${MANILA_GIT_BASE:-https://github.com} +MANILA_GIT_BASE=${MANILA_GIT_BASE:-https://git.openstack.org} MANILA_REPO_ROOT=${MANILA_REPO_ROOT:-openstack} MANILACLIENT_REPO=${MANILA_GIT_BASE}/${MANILA_REPO_ROOT}/python-manilaclient.git diff --git a/doc/source/contributor/architecture.rst b/doc/source/contributor/architecture.rst index 12a833b1d6..1ff19be823 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 49b8e946da..f22d647cf8 100644 --- a/doc/source/contributor/development-environment-devstack.rst +++ b/doc/source/contributor/development-environment-devstack.rst @@ -39,7 +39,7 @@ Start by cloning the devstack repository: :: - git clone https://github.com/openstack-dev/devstack + git clone https://git.openstack.org/openstack-dev/devstack Change to devstack directory: @@ -57,7 +57,7 @@ Enable the manila plugin adding the following line to the end of the local.conf :: - enable_plugin manila https://github.com/openstack/manila + enable_plugin manila https://git.openstack.org/openstack/manila If you would like to install python-manilaclient from git, add to local.conf: @@ -79,7 +79,7 @@ just after manila plugin enablement: :: - enable_plugin manila-ui https://github.com/openstack/manila-ui + enable_plugin manila-ui https://git.openstack.org/openstack/manila-ui Running devstack ---------------- diff --git a/doc/source/contributor/development.environment.rst b/doc/source/contributor/development.environment.rst index f50b92f698..7143b8cf76 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://github.com/openstack/manila.git + git clone https://git.openstack.org/openstack/manila.git cd manila diff --git a/doc/source/contributor/documenting_your_work.rst b/doc/source/contributor/documenting_your_work.rst index d7dd27a7bf..bed4bf7c30 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