diff --git a/doc/source/deploy/install-guide.rst b/doc/source/deploy/install-guide.rst index 202367f613..8838b57f64 100644 --- a/doc/source/deploy/install-guide.rst +++ b/doc/source/deploy/install-guide.rst @@ -67,9 +67,9 @@ additional functionality: - bifrost_; a set of Ansible playbooks that automates the task of deploying a base image onto a set of known hardware using ironic. -.. _ironic-inspector: https://github.com/openstack/ironic-inspector -.. _diskimage-builder: https://github.com/openstack/diskimage-builder -.. _bifrost: https://github.com/openstack/bifrost +.. _ironic-inspector: http://docs.openstack.org/developer/ironic-inspector/ +.. _diskimage-builder: http://docs.openstack.org/developer/diskimage-builder/ +.. _bifrost: http://docs.openstack.org/developer/bifrost/ .. todo: include coreos-image-builder reference here, once the split is done @@ -682,14 +682,7 @@ them to the Image service: 1. The `disk-image-builder`_ can be used to create images required for deployment and the actual OS which the user is going to run. -.. _disk-image-builder: https://github.com/openstack/diskimage-builder - - *Note:* `tripleo-incubator`_ provides a `script`_ to install all the - dependencies for the disk-image-builder. - -.. _tripleo-incubator: https://github.com/openstack/tripleo-incubator - -.. _script: https://github.com/openstack/tripleo-incubator/blob/master/scripts/install-dependencies +.. _disk-image-builder: http://docs.openstack.org/developer/diskimage-builder/ - Install diskimage-builder package (use virtualenv, if you don't want to install anything globally):: @@ -2231,7 +2224,7 @@ and provide the file or HTTP URL to the Bare Metal service. For the format of the configuration drive, Bare Metal service expects a ``gzipped`` and ``base64`` encoded ISO 9660 [*]_ file with a ``config-2`` label. The -`ironic client `_ +`ironic client `_ can generate a configuration drive in the `expected format`_. Just pass a directory path containing the files that will be injected into it via the ``--config-drive`` parameter of the ``node-set-provision-state`` command, @@ -2323,7 +2316,7 @@ CoreOS tools #. Clone the ironic-python-agent_ project:: - git clone https://github.com/openstack/ironic-python-agent + git clone https://git.openstack.org/openstack/ironic-python-agent #. Install the requirements:: @@ -2586,5 +2579,5 @@ following command. $ ironic node-set-maintenance $NODE_UUID off -.. _diskimage-builder: https://github.com/openstack/diskimage-builder -.. _ironic-python-agent: https://github.com/openstack/ironic-python-agent +.. _diskimage-builder: http://docs.openstack.org/developer/diskimage-builder/ +.. _ironic-python-agent: http://docs.openstack.org/developer/ironic-python-agent/ diff --git a/doc/source/deploy/upgrade-guide.rst b/doc/source/deploy/upgrade-guide.rst index 532cbadf68..e38b2e016b 100644 --- a/doc/source/deploy/upgrade-guide.rst +++ b/doc/source/deploy/upgrade-guide.rst @@ -23,8 +23,8 @@ client module for in-band inspection service, which was previously part of **ironic-discoverd** package. Ironic Liberty supports **ironic-discoverd** service, but does not support its in-tree client module. Please refer to `ironic-inspector version support matrix -`_ for -details on which Ironic version can work with which +`_ +for details on which Ironic version can work with which **ironic-inspector**/**ironic-discoverd** version. It's also highly recommended that you switch to using **ironic-inspector**, @@ -38,7 +38,7 @@ The discoverd to inspector upgrade procedure: #. (Recommended) update the **ironic-inspector** configuration file to stop using deprecated configuration options, as marked by the comments in the `example.conf - `_. + `_. The file name is provided on command line when starting **ironic-discoverd**, and the previously recommended default was diff --git a/doc/source/dev/architecture.rst b/doc/source/dev/architecture.rst index 26dda4dfc8..f753588e61 100644 --- a/doc/source/dev/architecture.rst +++ b/doc/source/dev/architecture.rst @@ -122,6 +122,6 @@ driver actions such as take-over or clean-up. .. _BaseDriver: ../api/ironic.drivers.base.html#ironic.drivers.base.BaseDriver .. _Conductor service: ../api/ironic.conductor.manager.html .. _DB API: ../api/ironic.db.api.html -.. _diskimage-builder: https://github.com/openstack/diskimage-builder +.. _diskimage-builder: http://docs.openstack.org/developer/diskimage-builder/ .. _consistent hashing algorithm: ../api/ironic.common.hash_ring.html .. _periodic: http://docs.openstack.org/developer/futurist/api.html#futurist.periodics.periodic diff --git a/doc/source/dev/contributing.rst b/doc/source/dev/contributing.rst index 78423172c7..506560c145 100644 --- a/doc/source/dev/contributing.rst +++ b/doc/source/dev/contributing.rst @@ -53,7 +53,7 @@ Wiki http://wiki.openstack.org/Ironic Code Hosting - https://github.com/openstack/ironic + https://git.openstack.org/cgit/openstack/ironic Code Review https://review.openstack.org/#/q/status:open+project:openstack/ironic,n,z diff --git a/doc/source/dev/dev-quickstart.rst b/doc/source/dev/dev-quickstart.rst index 49e1d1a48b..4c902a2e8d 100644 --- a/doc/source/dev/dev-quickstart.rst +++ b/doc/source/dev/dev-quickstart.rst @@ -348,13 +348,13 @@ station. Deploying Ironic with DevStack requires a machine running Ubuntu Devstack will no longer create the user 'stack' with the desired permissions, but does provide a script to perform the task:: - git clone https://github.com/openstack-dev/devstack.git devstack + git clone https://git.openstack.org/openstack-dev/devstack.git devstack sudo ./devstack/tools/create-stack-user.sh Switch to the stack user and clone DevStack:: sudo su - stack - git clone https://github.com/openstack-dev/devstack.git devstack + git clone https://git.openstack.org/openstack-dev/devstack.git devstack Create devstack/local.conf with minimal settings required to enable Ironic. You can use either of two drivers for deploy: pxe_* or agent_*, see :ref:`IPA` @@ -560,7 +560,7 @@ First, navigate to Tempest directory:: cd /opt/stack/tempest To run all tests from the `Ironic plugin -`_, +`_, execute the following command:: tox -e all-plugin -- ironic diff --git a/doc/source/drivers/seamicro.rst b/doc/source/drivers/seamicro.rst index c6f1b40a63..675484d450 100644 --- a/doc/source/drivers/seamicro.rst +++ b/doc/source/drivers/seamicro.rst @@ -112,4 +112,4 @@ boot an instance on it: References ========== .. [1] Python-seamicroclient - https://pypi.python.org/pypi/python-seamicroclient -.. [2] DiskImage-Builder - https://github.com/openstack/diskimage-builder +.. [2] DiskImage-Builder - http://docs.openstack.org/developer/diskimage-builder/ diff --git a/ironic/common/glance_service/v2/image_service.py b/ironic/common/glance_service/v2/image_service.py index 1b2ddcc430..95c0f2af72 100644 --- a/ironic/common/glance_service/v2/image_service.py +++ b/ironic/common/glance_service/v2/image_service.py @@ -301,9 +301,9 @@ class GlanceImageService(base_image_service.BaseImageService, def _get_swift_container(self, image_id): """Get the Swift container the image is stored in. - Code based on: https://github.com/openstack/glance_store/blob/3cd690b3 - 7dc9d935445aca0998e8aec34a3e3530/glance_store/ - _drivers/swift/store.py#L725 + Code based on: http://git.openstack.org/cgit/openstack/glance_store/ + tree/glance_store/_drivers/swift/ + store.py?id=3cd690b37dc9d935445aca0998e8aec34a3e3530#n725 Returns appropriate container name depending upon value of ``swift_store_multiple_containers_seed``. In single-container mode,