From 8c941ed187b62e89a4b6d75436ded19d9db67afd Mon Sep 17 00:00:00 2001 From: Luigi Toscano Date: Sat, 20 Apr 2019 14:55:03 +0200 Subject: [PATCH] Replace git.openstack.org URLs with opendev.org URLs Thorough replacement of git.openstack.org URLs with their opendev.org counterparts. Depends-On: https://review.opendev.org/653988 Change-Id: I6c7fffc1a32cb35ff7fe2ba964510b4f32805842 --- README.rst | 2 +- devstack/README.rst | 6 ++-- devstack/settings | 12 +++---- devstack/upgrade/settings | 8 ++--- .../admin/advanced-configuration-guide.rst | 33 +++++++++---------- doc/source/admin/upgrade-guide.rst | 2 +- .../dashboard-dev-environment-guide.rst | 6 ++-- .../contributor/development-environment.rst | 2 +- .../contributor/development-guidelines.rst | 2 +- doc/source/contributor/devstack.rst | 10 +++--- doc/source/contributor/how-to-participate.rst | 2 +- doc/source/contributor/testing.rst | 2 +- doc/source/install/dashboard-guide.rst | 4 +-- .../sahara-image-create.rst | 12 +++---- .../sahara-image-pack.rst | 2 +- doc/source/user/dashboard-user-guide.rst | 10 +++--- doc/source/user/edp.rst | 2 +- doc/source/user/hadoop-swift.rst | 2 +- doc/source/user/quickstart.rst | 2 +- etc/edp-examples/README.rst | 2 +- tox.ini | 10 +++--- 21 files changed, 65 insertions(+), 68 deletions(-) diff --git a/README.rst b/README.rst index 16fb0469c2..e90cb1f577 100644 --- a/README.rst +++ b/README.rst @@ -22,7 +22,7 @@ Quickstart guide: https://docs.openstack.org/sahara/latest/user/quickstart.html How to participate: https://docs.openstack.org/sahara/latest/contributor/how-to-participate.html -Source: https://git.openstack.org/cgit/openstack/sahara +Source: https://opendev.org/openstack/sahara Bugs and feature requests: https://storyboard.openstack.org/#!/project/935 diff --git a/devstack/README.rst b/devstack/README.rst index 916aa6a606..0093f11116 100644 --- a/devstack/README.rst +++ b/devstack/README.rst @@ -9,14 +9,14 @@ .. sourcecode:: bash [[local|localrc]] - enable_plugin sahara https://git.openstack.org/openstack/sahara - enable_plugin heat https://git.openstack.org/openstack/heat + enable_plugin sahara https://opendev.org/openstack/sahara + enable_plugin heat https://opendev.org/openstack/heat Optionally, a git refspec may be provided as follows: .. sourcecode:: bash [[local|localrc]] - enable_plugin sahara https://git.openstack.org/openstack/sahara + enable_plugin sahara https://opendev.org/openstack/sahara 3. run ``stack.sh`` diff --git a/devstack/settings b/devstack/settings index 18e10e992d..77a11c8825 100644 --- a/devstack/settings +++ b/devstack/settings @@ -16,17 +16,17 @@ VANILLA_PLUGIN_DIR=$DEST/sahara-plugin-vanilla SAHARACLIENT_REPO=${SAHARACLIENT_REPO:-\ ${GIT_BASE}/openstack/python-saharaclient.git} SAHARACLIENT_BRANCH=${SAHARACLIENT_BRANCH:-master} -AMBARI_PLUGIN_REPO=${AMBARI_PLUGIN_REPO:-https://git.openstack.org/openstack/sahara-plugin-ambari/} +AMBARI_PLUGIN_REPO=${AMBARI_PLUGIN_REPO:-https://opendev.org/openstack/sahara-plugin-ambari/} AMBARI_PLUGIN_BRANCH=${AMBARI_PLUGIN_BRANCH:-master} -CDH_PLUGIN_REPO=${CDH_PLUGIN_REPO:-https://git.openstack.org/openstack/sahara-plugin-cdh/} +CDH_PLUGIN_REPO=${CDH_PLUGIN_REPO:-https://opendev.org/openstack/sahara-plugin-cdh/} CDH_PLUGIN_BRANCH=${CDH_PLUGIN_BRANCH:-master} -MAPR_PLUGIN_REPO=${MAPR_PLUGIN_REPO:-https://git.openstack.org/openstack/sahara-plugin-mapr/} +MAPR_PLUGIN_REPO=${MAPR_PLUGIN_REPO:-https://opendev.org/openstack/sahara-plugin-mapr/} MAPR_PLUGIN_BRANCH=${MAPR_PLUGIN_BRANCH:-master} -SPARK_PLUGIN_REPO=${SPARK_PLUGIN_REPO:-https://git.openstack.org/openstack/sahara-plugin-spark/} +SPARK_PLUGIN_REPO=${SPARK_PLUGIN_REPO:-https://opendev.org/openstack/sahara-plugin-spark/} SPARK_PLUGIN_BRANCH=${SPARK_PLUGIN_BRANCH:-master} -STORM_PLUGIN_REPO=${STORM_PLUGIN_REPO:-https://git.openstack.org/openstack/sahara-plugin-storm/} +STORM_PLUGIN_REPO=${STORM_PLUGIN_REPO:-https://opendev.org/openstack/sahara-plugin-storm/} STORM_PLUGIN_BRANCH=${STORM_PLUGIN_BRANCH:-master} -VANILLA_PLUGIN_REPO=${VANILLA_PLUGIN_REPO:-https://git.openstack.org/openstack/sahara-plugin-vanilla/} +VANILLA_PLUGIN_REPO=${VANILLA_PLUGIN_REPO:-https://opendev.org/openstack/sahara-plugin-vanilla/} VANILLA_PLUGIN_BRANCH=${VANILLA_PLUGIN_BRANCH:-master} diff --git a/devstack/upgrade/settings b/devstack/upgrade/settings index 642c11560b..3472be00a7 100644 --- a/devstack/upgrade/settings +++ b/devstack/upgrade/settings @@ -6,10 +6,10 @@ devstack_localrc base IMAGE_URLS=\ "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-uec.tar.gz,\ http://tarballs.openstack.org/heat-test-image/fedora-heat-test-image.qcow2" devstack_localrc base enable_plugin sahara \ - https://git.openstack.org/openstack/sahara \ + https://opendev.org/openstack/sahara \ stable/rocky devstack_localrc base enable_plugin heat \ - https://git.openstack.org/openstack/heat \ + https://opendev.org/openstack/heat \ stable/rocky devstack_localrc base DEFAULT_IMAGE_NAME="cirros-0.3.5-x86_64-uec" devstack_localrc base DEFAULT_IMAGE_NAME="cirros-0.3.5-x86_64-uec" @@ -18,8 +18,8 @@ devstack_localrc target IMAGE_URLS=\ "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-uec.tar.gz,\ http://tarballs.openstack.org/heat-test-image/fedora-heat-test-image.qcow2" devstack_localrc target enable_plugin sahara \ - https://git.openstack.org/openstack/sahara + https://opendev.org/openstack/sahara devstack_localrc target enable_plugin heat \ - https://git.openstack.org/openstack/heat + https://opendev.org/openstack/heat devstack_localrc target LIBS_FROM_GIT=python-saharaclient devstack_localrc target DEFAULT_IMAGE_NAME="cirros-0.3.5-x86_64-uec" diff --git a/doc/source/admin/advanced-configuration-guide.rst b/doc/source/admin/advanced-configuration-guide.rst index 41779adde6..366d5917ec 100644 --- a/doc/source/admin/advanced-configuration-guide.rst +++ b/doc/source/admin/advanced-configuration-guide.rst @@ -223,27 +223,24 @@ respective source trees: * For Rabbit MQ see - * rabbit_opts variable in `impl_rabbit.py `_ - * amqp_opts variable in `amqp.py `_ + * rabbit_opts variable in `impl_rabbit.py `_ + * amqp_opts variable in `amqp.py `_ * For Zmq see - * zmq_opts variable in `impl_zmq.py `_ - * matchmaker_opts variable in `matchmaker.py `_ + * zmq_opts variable in `impl_zmq.py `_ + * matchmaker_opts variable in `matchmaker.py `_ * matchmaker_redis_opts variable in `matchmaker_redis.py `_ - * matchmaker_opts variable in `matchmaker_ring.py `_ + opendev.org/openstack/oslo.messaging/src/tag/1.4.0/oslo/messaging/ + _drivers/matchmaker_redis.py#L26>`_ + * matchmaker_opts variable in `matchmaker_ring.py `_ These options will also be present in the generated sample configuration file. For instructions on creating the configuration file please see the @@ -514,7 +511,7 @@ installed. The sources for this plugin can be found in the integration see the sahara documentation sections :ref:`building-guest-images-label` and :ref:`swift-integration-label`. -.. _Sahara extra repository: https://git.openstack.org/cgit/openstack/sahara-extra +.. _Sahara extra repository: https://openstack.org/openstack/sahara-extra .. _volume_instance_locality_configuration: diff --git a/doc/source/admin/upgrade-guide.rst b/doc/source/admin/upgrade-guide.rst index ca5357ad17..65fcd0f207 100644 --- a/doc/source/admin/upgrade-guide.rst +++ b/doc/source/admin/upgrade-guide.rst @@ -68,7 +68,7 @@ those user interface components. For more details on this process please see :ref:`registering Sahara in installation guide `. The -`sahara-dashboard `_ +`sahara-dashboard `_ project is now used solely to host sahara user interface integration tests. Virtual machine user name changes diff --git a/doc/source/contributor/dashboard-dev-environment-guide.rst b/doc/source/contributor/dashboard-dev-environment-guide.rst index 6d6ce8ac08..05ba9f4dfd 100644 --- a/doc/source/contributor/dashboard-dev-environment-guide.rst +++ b/doc/source/contributor/dashboard-dev-environment-guide.rst @@ -17,7 +17,7 @@ to your ``local.conf`` file .. sourcecode:: bash # Enable sahara-dashboard - enable_plugin sahara-dashboard https://git.openstack.org/openstack/sahara-dashboard + enable_plugin sahara-dashboard https://opendev.org/openstack/sahara-dashboard Isolated Dashboard for Sahara @@ -66,7 +66,7 @@ Here is an example: .. sourcecode:: console - $ git clone https://git.openstack.org/openstack/horizon/ {HORIZON_DIR} + $ git clone https://opendev.org/openstack/horizon/ {HORIZON_DIR} .. Then install the virtual environment: @@ -105,7 +105,7 @@ creation, add the following parameter: .. sourcecode:: console - $ git clone https://git.openstack.org/openstack/sahara-dashboard/ \ + $ git clone https://opendev.org/openstack/sahara-dashboard/ \ {SAHARA_DASHBOARD_DIR} .. diff --git a/doc/source/contributor/development-environment.rst b/doc/source/contributor/development-environment.rst index d4df98b52b..8c1d28aab6 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 https://git.openstack.org/openstack/sahara.git + $ git clone https://opendev.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 66471efdb5..cebf96f7b9 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://git.openstack.org/cgit/openstack-dev/bashate +.. _bashate: https://opendev.org/openstack/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/devstack.rst b/doc/source/contributor/devstack.rst index c711eb4380..98d6ce2908 100644 --- a/doc/source/contributor/devstack.rst +++ b/doc/source/contributor/devstack.rst @@ -55,7 +55,7 @@ and may cause hard to debug problems. .. sourcecode:: console $ sudo apt-get install git-core - $ git clone https://git.openstack.org/openstack-dev/devstack.git + $ git clone https://opendev.org/openstack/devstack.git 2. Create the file ``local.conf`` in devstack directory with the following content: @@ -97,10 +97,10 @@ and may cause hard to debug problems. # OFFLINE=True # Enable sahara - enable_plugin sahara https://git.openstack.org/openstack/sahara + enable_plugin sahara https://opendev.org/openstack/sahara # Enable heat - enable_plugin heat https://git.openstack.org/openstack/heat + enable_plugin heat https://opendev.org/openstack/heat In cases where you need to specify a git refspec (branch, tag, or commit hash) for the sahara in-tree devstack plugin (or sahara repo), it should be @@ -108,7 +108,7 @@ appended to the git repo URL as follows: .. sourcecode:: bash - enable_plugin sahara https://git.openstack.org/openstack/sahara + enable_plugin sahara https://opendev.org/openstack/sahara 3. Sahara can send notifications to Ceilometer, if Ceilometer is enabled. If you want to enable Ceilometer add the following lines to the @@ -116,7 +116,7 @@ appended to the git repo URL as follows: .. sourcecode:: bash - enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer + enable_plugin ceilometer https://opendev.org/openstack/ceilometer 4. Start DevStack: diff --git a/doc/source/contributor/how-to-participate.rst b/doc/source/contributor/how-to-participate.rst index ff8d5add2e..31b39b6a3c 100644 --- a/doc/source/contributor/how-to-participate.rst +++ b/doc/source/contributor/how-to-participate.rst @@ -50,7 +50,7 @@ How to stay in touch with the community How to post your first patch for review --------------------------------------- -* Checkout Sahara code from `its repository `_ +* Checkout Sahara code from `its repository `_ * Carefully read https://docs.openstack.org/infra/manual/developers.html#development-workflow diff --git a/doc/source/contributor/testing.rst b/doc/source/contributor/testing.rst index e2ca0034c2..92700a7f11 100644 --- a/doc/source/contributor/testing.rst +++ b/doc/source/contributor/testing.rst @@ -14,7 +14,7 @@ Scenario integration tests New scenario integration tests were implemented for Sahara. They are available in the sahara-tests repository -(https://git.openstack.org/cgit/openstack/sahara-tests). +(https://opendev.org/openstack/sahara-tests). Tempest tests +++++++++++++ diff --git a/doc/source/install/dashboard-guide.rst b/doc/source/install/dashboard-guide.rst index 474e472851..cea7ec698a 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 `from the Horizon repository. `_ +The sample configuration file is available `from the Horizon repository. `_ 1. Networking ------------- @@ -56,7 +56,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 -`__. +`__. .. sourcecode:: python diff --git a/doc/source/user/building-guest-images/sahara-image-create.rst b/doc/source/user/building-guest-images/sahara-image-create.rst index e2f2533f46..316de29c08 100644 --- a/doc/source/user/building-guest-images/sahara-image-create.rst +++ b/doc/source/user/building-guest-images/sahara-image-create.rst @@ -2,7 +2,7 @@ sahara-image-create ------------------- The historical tool for building images, ``sahara-image-create``, is based on -`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 @@ -10,11 +10,11 @@ chroot to prepare the image. The additional elements required by Sahara images and the ``sahara-image-create`` command itself are stored in the -`Sahara image elements repository `_ +`Sahara image elements repository `_ To create images for a specific plugin follow these steps: -1. Clone repository "https://git.openstack.org/cgit/openstack/sahara-image-elements" +1. Clone repository "https://opendev.org/openstack/sahara-image-elements" locally. 2. Use tox to build images. @@ -36,8 +36,8 @@ To create images for a specific plugin follow these steps: tox -e venv -- sahara-image-create -p -v -i Tox will create a virtualenv and install required python packages in it, - clone the repositories "https://git.openstack.org/cgit/openstack/diskimage-builder" and - "https://git.openstack.org/cgit/openstack/sahara-image-elements" and export necessary + clone the repositories "https://opendev.org/openstack/diskimage-builder" and + "https://opendev.org/openstack/sahara-image-elements" and export necessary parameters. The valid values for the ```` argument are: @@ -77,4 +77,4 @@ image: format. For finer control of ``sahara-image-create`` see the `official documentation -`_ +`_ diff --git a/doc/source/user/building-guest-images/sahara-image-pack.rst b/doc/source/user/building-guest-images/sahara-image-pack.rst index 26e3e0ce12..84dd848dd8 100644 --- a/doc/source/user/building-guest-images/sahara-image-pack.rst +++ b/doc/source/user/building-guest-images/sahara-image-pack.rst @@ -65,7 +65,7 @@ Installation and developer notes The script is part of of the Sahara repository, but it does not depend on the Sahara services. In order to use its development version, -clone the `Sahara repository `_, +clone the `Sahara repository `_, check out the branch which matches the Sahara version used, and install the repository in a virtualenv. diff --git a/doc/source/user/dashboard-user-guide.rst b/doc/source/user/dashboard-user-guide.rst index 080a2da77c..942e73e89d 100644 --- a/doc/source/user/dashboard-user-guide.rst +++ b/doc/source/user/dashboard-user-guide.rst @@ -253,14 +253,14 @@ Example Jobs There are sample jobs located in the sahara repository. In this section, we will give a walkthrough on how to run those jobs via the Horizon UI. These steps assume that you already have a cluster up and running (in the "Active" -state). You may want to clone into https://git.openstack.org/cgit/openstack/sahara-tests/ +state). You may want to clone into https://opendev.org/openstack/sahara-tests/ so that you will have all of the source code and inputs stored locally. 1) Sample Pig job - - https://git.openstack.org/cgit/openstack/sahara-tests/tree/sahara_tests/scenario/defaults/edp-examples/edp-pig/cleanup-string/example.pig + https://opendev.org/openstack/sahara-tests/src/branch/master/sahara_tests/scenario/defaults/edp-examples/edp-pig/cleanup-string/example.pig - Load the input data file from - https://git.openstack.org/cgit/openstack/sahara-tests/tree/sahara_tests/scenario/defaults/edp-examples/edp-pig/cleanup-string/data/input + https://opendev.org/openstack/sahara-tests/src/branch/master/sahara_tests/scenario/defaults/edp-examples/edp-pig/cleanup-string/data/input into swift - Click on Project/Object Store/Containers and create a container with any @@ -339,8 +339,8 @@ so that you will have all of the source code and inputs stored locally. It should be in the "pigoutput" folder 2) Sample Spark job - - https://git.openstack.org/cgit/openstack/sahara-tests/tree/sahara_tests/scenario/defaults/edp-examples/edp-spark - You can clone into https://git.openstack.org/cgit/openstack/sahara-tests/ for quicker + https://opendev.org/openstack/sahara-tests/src/branch/master/sahara_tests/scenario/defaults/edp-examples/edp-spark + You can clone into https://opendev.org/openstack/sahara-tests/ for quicker access to the files for this sample job. - Store the Job Binary in Swift (you can choose another type of storage if diff --git a/doc/source/user/edp.rst b/doc/source/user/edp.rst index 618d1d8a50..05037473d4 100644 --- a/doc/source/user/edp.rst +++ b/doc/source/user/edp.rst @@ -502,7 +502,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 1e4891123e..b8966e5b91 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 `_ + `Sahara Extra repository `_ * The latest compiled version of the jar for this component can be downloaded from https://tarballs.openstack.org/sahara-extra/dist/hadoop-openstack/master/ diff --git a/doc/source/user/quickstart.rst b/doc/source/user/quickstart.rst index fe84f06975..c24f8dabeb 100644 --- a/doc/source/user/quickstart.rst +++ b/doc/source/user/quickstart.rst @@ -274,7 +274,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/etc/edp-examples/README.rst b/etc/edp-examples/README.rst index 8b4ba764e8..7c9a6e4ab8 100644 --- a/etc/edp-examples/README.rst +++ b/etc/edp-examples/README.rst @@ -3,4 +3,4 @@ Sahara files for EDP ===================== All files from this directory have been moved to new -sahara-tests repository: https://git.openstack.org/cgit/openstack/sahara-tests +sahara-tests repository: https://opendev.org/openstack/sahara-tests diff --git a/tox.ini b/tox.ini index d024ade483..781dc3055d 100644 --- a/tox.ini +++ b/tox.ini @@ -10,7 +10,7 @@ setenv = VIRTUAL_ENV={envdir} DISCOVER_DIRECTORY=sahara/tests/unit deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} + -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = stestr run {posargs} @@ -33,7 +33,7 @@ commands = oslo_debug_helper -t sahara/tests/unit {posargs} [testenv:pep8] basepython = python3 deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} + -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt -r{toxinidir}/doc/requirements.txt @@ -60,7 +60,7 @@ commands = {posargs} [testenv:docs] basepython = python3 deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} + -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} -r{toxinidir}/doc/requirements.txt commands = rm -rf doc/html doc/build @@ -74,7 +74,7 @@ whitelist_externals = rm [testenv:api-ref] basepython = python3 deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} + -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} -r{toxinidir}/doc/requirements.txt install_command = pip install -U --force-reinstall {opts} {packages} commands = @@ -97,7 +97,7 @@ commands = [testenv:releasenotes] basepython = python3 deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} + -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} -r{toxinidir}/doc/requirements.txt commands = rm -rf releasenotes/build releasenotes/html