diff --git a/doc/source/admin/advanced-configuration-guide.rst b/doc/source/admin/advanced-configuration-guide.rst index e040ac0bf8..a8afb60024 100644 --- a/doc/source/admin/advanced-configuration-guide.rst +++ b/doc/source/admin/advanced-configuration-guide.rst @@ -517,7 +517,7 @@ installed. The sources for this plugin can be found in the integration see the sahara documentation sections :ref:`diskimage-builder-label` and :ref:`swift-integration-label`. -.. _Sahara extra repository: http://github.com/openstack/sahara-extra +.. _Sahara extra repository: http://git.openstack.org/cgit/openstack/sahara-extra .. _volume_instance_locality_configuration: diff --git a/doc/source/contributor/apiv2.rst b/doc/source/contributor/apiv2.rst index ee67d4a243..d72d3c9bea 100644 --- a/doc/source/contributor/apiv2.rst +++ b/doc/source/contributor/apiv2.rst @@ -79,7 +79,7 @@ project identifier in a header named ``OpenStack-Project-ID``:: X-Auth-Token: {valid auth token} OpenStack-Project-ID: 12345678-1234-1234-1234-123456789ABC -Using a tool like `HTTPie `_, the +Using a tool like `HTTPie `_, the same request could be made like this:: $ httpie http://{sahara service ip:port}/v2/clusters \ diff --git a/doc/source/contributor/development-environment.rst b/doc/source/contributor/development-environment.rst index 5b6f8b4ac7..3ec89fb748 100644 --- a/doc/source/contributor/development-environment.rst +++ b/doc/source/contributor/development-environment.rst @@ -52,7 +52,7 @@ On openSUSE-based distributions (SLES 12, openSUSE, Factory or Tumbleweed): .. sourcecode:: console - $ git clone git://github.com/openstack/sahara.git + $ git clone git://git.openstack.org/openstack/sahara.git $ cd sahara 3. Generate Sahara sample using tox diff --git a/doc/source/contributor/development-guidelines.rst b/doc/source/contributor/development-guidelines.rst index 4ec2fcfcb0..ec68364ae5 100644 --- a/doc/source/contributor/development-guidelines.rst +++ b/doc/source/contributor/development-guidelines.rst @@ -125,7 +125,7 @@ running ``tox -e docs`` first time): .. _PEP 8: http://www.python.org/dev/peps/pep-0008/ -.. _bashate: https://github.com/openstack-dev/bashate +.. _bashate: https://git.openstack.org/cgit/openstack-dev/bashate .. _PEP 257: http://www.python.org/dev/peps/pep-0257/ .. _Tox: http://tox.testrun.org/ .. _Sphinx: http://sphinx.pocoo.org/markup/index.html diff --git a/doc/source/contributor/how-to-participate.rst b/doc/source/contributor/how-to-participate.rst index 04132e15ee..a8ab50c4dd 100644 --- a/doc/source/contributor/how-to-participate.rst +++ b/doc/source/contributor/how-to-participate.rst @@ -4,11 +4,8 @@ How to Participate Getting started --------------- -* Create an account on `Github `_ - (if you don't have one) - - * Make sure that your local git is properly configured by executing - ``git config --list``. If not, configure ``user.name``, ``user.email`` +* Make sure that your local git is properly configured by executing + ``git config --list``. If not, configure ``user.name``, ``user.email`` * Create account on `Launchpad `_ (if you don't have one) @@ -54,7 +51,7 @@ How to stay in touch with the community How to post your first patch for review --------------------------------------- -* Checkout Sahara code from `Github `_ +* Checkout Sahara code from `its repository `_ * Carefully read http://docs.openstack.org/infra/manual/developers.html#development-workflow diff --git a/doc/source/install/dashboard-guide.rst b/doc/source/install/dashboard-guide.rst index 49c3b40f3b..73a52deb9c 100644 --- a/doc/source/install/dashboard-guide.rst +++ b/doc/source/install/dashboard-guide.rst @@ -5,7 +5,7 @@ After installing the Sahara dashboard, there are a few extra configurations that can be made. Dashboard configurations are applied through Horizon's local_settings.py file. -The sample configuration file is available `here. `_ +The sample configuration file is available `from the Horizon repository. `_ 1. Networking ------------- @@ -54,7 +54,7 @@ Local endpoint example: .. Then the endpoint name should be changed in ``sahara.py`` under the module of -`sahara-dashboard/sahara_dashboard/api/sahara.py. `_ +`sahara-dashboard/sahara_dashboard/api/sahara.py. `_ .. sourcecode:: python diff --git a/doc/source/user/ambari-plugin.rst b/doc/source/user/ambari-plugin.rst index dd3772a57c..8dcebc0c2a 100644 --- a/doc/source/user/ambari-plugin.rst +++ b/doc/source/user/ambari-plugin.rst @@ -26,7 +26,7 @@ Images The sahara Ambari plugin is using minimal (operating system only) images. For more information about Ambari images, refer to -https://github.com/openstack/sahara-image-elements. +``_. You could download well tested and up-to-date prepared images from http://sahara-files.mirantis.com/images/upstream/ diff --git a/doc/source/user/cdh-imagebuilder.rst b/doc/source/user/cdh-imagebuilder.rst index e3d0d3cfea..fe8ff91464 100644 --- a/doc/source/user/cdh-imagebuilder.rst +++ b/doc/source/user/cdh-imagebuilder.rst @@ -8,14 +8,14 @@ images with Cloudera Express (now only versions {5.0.0, 5.3.0 5.4.0, 5.5.0, 5.7.x, 5.9.x} are supported). To simplify the task of building such images we use -`Disk Image Builder `_. +`Disk Image Builder `_. `Disk Image Builder` builds disk images using elements. An element is a particular set of code that alters how the image is built, or runs within the chroot to prepare the image. Elements for building Cloudera images are stored in -`Sahara extra repository `_ +`Sahara extra repository `_ .. note:: @@ -27,7 +27,7 @@ Elements for building Cloudera images are stored in To create cloudera images follow these steps: -1. Clone repository "https://github.com/openstack/sahara-image-elements" locally. +1. Clone repository "https://git.openstack.org/cgit/openstack/sahara-image-elements" locally. 2. Use tox to build images. @@ -86,4 +86,4 @@ To create cloudera images follow these steps: For finer control of diskimage-create.sh see the `official documentation -`_ +`_ diff --git a/doc/source/user/edp.rst b/doc/source/user/edp.rst index efd626a28f..cc6ae7c78e 100644 --- a/doc/source/user/edp.rst +++ b/doc/source/user/edp.rst @@ -482,7 +482,7 @@ If configuration values are specified, they must be added to the job's Hadoop configuration at runtime. There are two methods of doing this. The simplest way is to use the **edp.java.adapt_for_oozie** option described below. The other method is to use the code from -`this example `_ +`this example `_ to explicitly load the values. The following special configuration values are read by sahara and affect how diff --git a/doc/source/user/hadoop-swift.rst b/doc/source/user/hadoop-swift.rst index c2dff9bb01..cb8756d522 100644 --- a/doc/source/user/hadoop-swift.rst +++ b/doc/source/user/hadoop-swift.rst @@ -12,7 +12,7 @@ the most current features enabled. https://issues.apache.org/jira/browse/HADOOP-8545 * The most current Sahara maintained version of this patch can be found in the - Sahara Extra repository https://github.com/openstack/sahara-extra + `Sahara Extra repository `_ * The latest compiled version of the jar for this component can be downloaded from http://tarballs.openstack.org/sahara/dist/hadoop-openstack/master/ diff --git a/doc/source/user/mapr-plugin.rst b/doc/source/user/mapr-plugin.rst index 89904aa7d0..82efde7f73 100644 --- a/doc/source/user/mapr-plugin.rst +++ b/doc/source/user/mapr-plugin.rst @@ -31,7 +31,7 @@ put a burden on the network as packages for all nodes need to be downloaded from the package repository. For more information about MapR images, refer to -https://github.com/openstack/sahara-image-elements. +``_. There are VM images provided for use with the MapR Plugin, that can also be built using the tools available in sahara-image-elements: diff --git a/doc/source/user/quickstart.rst b/doc/source/user/quickstart.rst index 30bfebbafa..ebe5fd2369 100644 --- a/doc/source/user/quickstart.rst +++ b/doc/source/user/quickstart.rst @@ -89,7 +89,7 @@ Upload the image downloaded above into the OpenStack Image service: OR -* Build the image using: `diskimage-builder script `_ +* Build the image using: `diskimage-builder script `_ Remember the image name or save the image ID. This will be used during the image registration with sahara. You can get the image ID using the @@ -259,7 +259,7 @@ the template below. Sample templates can be found here: -`Sample Templates `_ +`Sample Templates `_ Create a file named ``my_master_template_create.json`` with the following content: diff --git a/doc/source/user/sahara-on-ironic.rst b/doc/source/user/sahara-on-ironic.rst index 4b21d7c670..268f8b2823 100644 --- a/doc/source/user/sahara-on-ironic.rst +++ b/doc/source/user/sahara-on-ironic.rst @@ -20,7 +20,7 @@ from the bare metal performance with self-service resource provisioning. 4. Build the Sahara image and prepare it for uploading to Glance: - Build an image for Sahara plugin with the ``-b`` flag. Use sahara image elements - when building the image. See ``_ + when building the image. See ``_ - Convert the qcow2 image format to the raw format. For example: diff --git a/doc/source/user/spark-plugin.rst b/doc/source/user/spark-plugin.rst index e74156d061..df991af7d4 100644 --- a/doc/source/user/spark-plugin.rst +++ b/doc/source/user/spark-plugin.rst @@ -14,7 +14,7 @@ For cluster provisioning, prepared images should be used. The Spark plugin has been developed and tested with the images generated by sahara-image-elements: -* https://github.com/openstack/sahara-image-elements +* https://git.openstack.org/cgit/openstack/sahara-image-elements The latest Ubuntu images generated by sahara-image-elements have Cloudera CDH 5.4.0 HDFS and Apache Spark installed. A prepared image for Spark can be diff --git a/doc/source/user/vanilla-imagebuilder.rst b/doc/source/user/vanilla-imagebuilder.rst index 17bc39d376..1cfb61970d 100644 --- a/doc/source/user/vanilla-imagebuilder.rst +++ b/doc/source/user/vanilla-imagebuilder.rst @@ -8,14 +8,14 @@ CentOS images with Apache Hadoop version 2.x.x. As of now the vanilla plugin works with images with pre-installed versions of Apache Hadoop. To simplify the task of building such images we use -`Disk Image Builder `_. +`Disk Image Builder `_. `Disk Image Builder` builds disk images using elements. An element is a particular set of code that alters how the image is built, or runs within the chroot to prepare the image. Elements for building vanilla images are stored in the -`Sahara image elements repository `_ +`Sahara image elements repository `_ .. note:: @@ -28,7 +28,7 @@ Elements for building vanilla images are stored in the To create vanilla images follow these steps: -1. Clone repository "https://github.com/openstack/sahara-image-elements" +1. Clone repository "https://git.openstack.org/cgit/openstack/sahara-image-elements" locally. 2. Use tox to build images. @@ -49,8 +49,8 @@ To create vanilla images follow these steps: tox -e venv -- sahara-image-create -p vanilla -v 2.7.1 -i centos7 Tox will create a virtualenv and install required python packages in it, - clone the repositories "https://github.com/openstack/diskimage-builder" and - "https://github.com/openstack/sahara-image-elements" and export necessary + clone the repositories "https://git.openstack.org/cgit/openstack/diskimage-builder" and + "https://git.openstack.org/cgit/openstack/sahara-image-elements" and export necessary parameters. * ``DIB_HADOOP_VERSION`` - version of Hadoop to install @@ -92,4 +92,4 @@ To create vanilla images follow these steps: For finer control of diskimage-create.sh see the `official documentation -`_ +`_