diff --git a/README.rst b/README.rst index faf75fc17c..6ed218bf0c 100644 --- a/README.rst +++ b/README.rst @@ -18,8 +18,8 @@ For more information, please refer to the following resources: * **Free software:** under the `Apache license `_ * **Documentation:** https://docs.openstack.org/magnum/latest/ -* **Source:** http://git.openstack.org/cgit/openstack/magnum +* **Source:** https://opendev.org/openstack/magnum * **Blueprints:** https://blueprints.launchpad.net/magnum * **Bugs:** https://storyboard.openstack.org/#!/project/openstack/magnum -* **REST Client:** http://git.openstack.org/cgit/openstack/python-magnumclient -* ** Release notes:** https://docs.openstack.org/releasenotes/magnum/index.html +* **REST Client:** https://opendev.org/openstack/python-magnumclient +* **Release notes:** https://docs.openstack.org/releasenotes/magnum/index.html diff --git a/contrib/drivers/k8s_opensuse_v1/templates/README.md b/contrib/drivers/k8s_opensuse_v1/templates/README.md index efa24c4597..2007066830 100644 --- a/contrib/drivers/k8s_opensuse_v1/templates/README.md +++ b/contrib/drivers/k8s_opensuse_v1/templates/README.md @@ -125,5 +125,5 @@ Please submit bugs and pull requests via the Gerrit repository at https://review.openstack.org/. For more information, please refer to the following resources: -* **Documentation:** http://docs.openstack.org/developer/magnum -* **Source:** http://git.openstack.org/cgit/openstack/magnum +* **Documentation:** https://docs.openstack.org/magnum/latest/ +* **Source:** https://opendev.org/openstack/magnum diff --git a/doc/source/admin/troubleshooting-guide.rst b/doc/source/admin/troubleshooting-guide.rst index 373cc2f2b5..5e8c6826a1 100644 --- a/doc/source/admin/troubleshooting-guide.rst +++ b/doc/source/admin/troubleshooting-guide.rst @@ -114,7 +114,7 @@ access the OpenStack services (i.e. Neutron, Swift, etc.). A trust relationship will be created between the user who created the cluster (the "trustor") and the service account created for the cluster (the "trustee"). For details, please refer -`_. +`_. If Magnum fails to create the trustee, check the magnum config file (usually in /etc/magnum/magnum.conf). Make sure 'trustee_*' and 'auth_uri' are set and diff --git a/doc/source/index.rst b/doc/source/index.rst index 0a993b1505..a8ab3046bd 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -22,10 +22,10 @@ Magnum is an OpenStack project which offers container orchestration engines for deploying and managing containers as first class resources in OpenStack. * **Free software:** under the `Apache license `_ -* **Source:** http://git.openstack.org/cgit/openstack/magnum +* **Source:** https://opendev.org/openstack/magnum * **Blueprints:** https://blueprints.launchpad.net/magnum -* **Bugs:** http://bugs.launchpad.net/magnum -* **REST Client:** http://git.openstack.org/cgit/openstack/python-magnumclient +* **Bugs:** https://bugs.launchpad.net/magnum +* **REST Client:** https://opendev.org/openstack/python-magnumclient Architecture ============ diff --git a/doc/source/user/index.rst b/doc/source/user/index.rst index 33fb905252..d816f16329 100644 --- a/doc/source/user/index.rst +++ b/doc/source/user/index.rst @@ -1758,7 +1758,7 @@ Diskimage-builder To run the `diskimage-builder `__ tool manually, use the provided `elements -`__. +`__. Following are the typical steps to use the diskimage-builder tool on an Ubuntu server:: @@ -1784,7 +1784,7 @@ Dockerfile To build the image as above but within a Docker container, use the provided `Dockerfile -`__. +`__. The output image will be saved as '/tmp/ubuntu-mesos.qcow2'. Following are the typical steps to run a Docker container to build the image:: diff --git a/tox.ini b/tox.ini index 53916e72e8..7983356aaf 100644 --- a/tox.ini +++ b/tox.ini @@ -6,7 +6,7 @@ skipsdist = True [testenv] usedevelop = True install_command = - pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} + pip install -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} {opts} {packages} whitelist_externals = bash find rm