From ee8497176aed2cf849a00afbe5728bf909d4b1aa Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotjagov Date: Sat, 20 Apr 2019 13:41:00 +0300 Subject: [PATCH] Replace git.openstack.org with opendev.org This patch replaces git.openstack.org with opendev.org as redirection from old path was enabled. Path do not fix path in run_tests.sh and scripts/scripts-library.sh as I'm not really sure whether it's safe to change now. Depends-On: https://review.opendev.org/653978/ Change-Id: I700fa432c88e77ca1b0e29667d04bfbb67829735 --- README.rst | 6 +++--- ansible-role-requirements.yml | 2 +- bindep.txt | 2 +- deploy-guide/source/deploymenthost.rst | 4 ++-- doc/source/admin/scale-environment.rst | 4 ++-- doc/source/contributor/code-rules.rst | 2 +- doc/source/contributor/contribute.rst | 6 +++--- doc/source/contributor/testing.rst | 4 ++-- doc/source/reference/configuration/extending-osa.rst | 2 +- doc/source/user/aio/quickstart.rst | 4 ++-- playbooks/defaults/healthchecks-vars.yml | 4 ++-- .../defaults/repo_packages/openstack_services.yml | 4 +++- playbooks/healthcheck-hosts.yml | 2 +- playbooks/utility-install.yml | 2 +- releasenotes/source/conf.py | 2 +- run_tests.sh | 6 +++--- scripts/bootstrap-ansible.sh | 2 +- scripts/scripts-library.sh | 2 +- scripts/sources-branch-updater-lib.sh | 10 +++++----- .../templates/user_variables_barbican.yml.j2 | 2 +- .../templates/user_variables_manila.yml.j2 | 2 +- tox.ini | 8 ++++---- 22 files changed, 42 insertions(+), 40 deletions(-) diff --git a/README.rst b/README.rst index 14ecd74c0b..85d2ed90be 100644 --- a/README.rst +++ b/README.rst @@ -44,14 +44,14 @@ that OpenStack-Ansible supports. For individual role configuration options, see the `Role Documentation`_. An individual role's source code can be found at: -https://git.openstack.org/cgit/openstack/openstack-ansible-. +https://opendev.org/openstack/openstack-ansible-. .. _official OpenStack project: https://governance.openstack.org/tc/reference/projects/index.html .. _Home Page: https://governance.openstack.org/tc/reference/projects/openstackansible.html .. _Deployment Guide: https://docs.openstack.org/project-deploy-guide/openstack-ansible/latest .. _Quick Start: https://docs.openstack.org/openstack-ansible/latest/user/aio/quickstart.html .. _Developer Documentation: https://docs.openstack.org/openstack-ansible/latest/contributor/index.html -.. _Source: https://git.openstack.org/cgit/openstack/openstack-ansible +.. _Source: https://opendev.org/openstack/openstack-ansible .. _OpenStack Mailing Lists: http://lists.openstack.org/ .. _freenode network: https://freenode.net/ .. _Role Documentation: https://docs.openstack.org/project-deploy-guide/openstack-ansible/draft/configure.html#advanced-service-configuration @@ -61,6 +61,6 @@ Resources * License: Apache License, Version 2.0 * Documentation: https://docs.openstack.org/openstack-ansible/latest/ -* Source: https://git.openstack.org/cgit/openstack/openstack-ansible +* Source: https://opendev.org/openstack/openstack-ansible * Bugs: https://bugs.launchpad.net/openstack-ansible * Release notes: https://docs.openstack.org/releasenotes/openstack-ansible/ diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml index 4f16f36b6b..f43116a3f1 100644 --- a/ansible-role-requirements.yml +++ b/ansible-role-requirements.yml @@ -170,7 +170,7 @@ trackbranch: master - name: os_placement scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_placement + src: https://opendev.org/openstack/openstack-ansible-os_placement version: master trackbranch: master - name: os_rally diff --git a/bindep.txt b/bindep.txt index 30316f5dad..ed381a4785 100644 --- a/bindep.txt +++ b/bindep.txt @@ -3,7 +3,7 @@ # # See the following for details: # - https://docs.openstack.org/infra/bindep/ -# - https://git.openstack.org/cgit/openstack-infra/bindep +# - https://opendev.org/opendev/bindep/ # # Even if the role does not make use of this facility, it # is better to have this file empty, otherwise OpenStack-CI diff --git a/deploy-guide/source/deploymenthost.rst b/deploy-guide/source/deploymenthost.rst index c79cd8696d..2ae800ee95 100644 --- a/deploy-guide/source/deploymenthost.rst +++ b/deploy-guide/source/deploymenthost.rst @@ -174,9 +174,9 @@ Install the source and dependencies for the deployment host. .. parsed-literal:: - # git clone -b |latest_tag| \https://git.openstack.org/openstack/openstack-ansible /opt/openstack-ansible + # git clone -b |latest_tag| \https://opendev.org/openstack/openstack-ansible /opt/openstack-ansible - If git.openstack.org can not be accessed to run git clone, github.com can be used + If opendev.org can not be accessed to run git clone, github.com can be used as an alternative repo: .. parsed-literal:: diff --git a/doc/source/admin/scale-environment.rst b/doc/source/admin/scale-environment.rst index 29fcd34a97..15e668b4e3 100644 --- a/doc/source/admin/scale-environment.rst +++ b/doc/source/admin/scale-environment.rst @@ -123,7 +123,7 @@ new node. Remove a compute host ~~~~~~~~~~~~~~~~~~~~~ -The `openstack-ansible-ops `_ +The `openstack-ansible-ops `_ repository contains a playbook for removing a compute host from an OpenStack-Ansible environment. To remove a compute host, follow the below procedure. @@ -153,7 +153,7 @@ To remove a compute host, follow the below procedure. .. code-block:: console - $ git clone https://git.openstack.org/openstack/openstack-ansible-ops \ + $ git clone https://opendev.org/openstack/openstack-ansible-ops \ /opt/openstack-ansible-ops #. Run the ``remove_compute_node.yml`` Ansible playbook with the diff --git a/doc/source/contributor/code-rules.rst b/doc/source/contributor/code-rules.rst index 590748e844..4cd46cd521 100644 --- a/doc/source/contributor/code-rules.rst +++ b/doc/source/contributor/code-rules.rst @@ -187,7 +187,7 @@ However, to help you in the writing of the specification, we have a `specification template`_ that can be copied into the latest release name folder. Rename and edit it for your needs. -.. _specification template: https://git.openstack.org/cgit/openstack/openstack-ansible-specs/tree/specs/templates/template.rst +.. _specification template: https://opendev.org/openstack/openstack-ansible-specs/src/specs/templates/template.rst .. _Ansible Style Guide: diff --git a/doc/source/contributor/contribute.rst b/doc/source/contributor/contribute.rst index 531f65bcf1..b13dc71a9d 100644 --- a/doc/source/contributor/contribute.rst +++ b/doc/source/contributor/contribute.rst @@ -165,8 +165,8 @@ Here are the steps to write the role: openstack-ansible integrated repository, and deploy the role on an AIO. See also :ref:`integrate-new-role-with-aio`. -.. _specs repository: https://git.openstack.org/cgit/openstack/openstack-ansible-specs -.. _unmerged specs: https://review.openstack.org/#/q/status:+open+project:openstack/openstack-ansible-specs +.. _specs repository: https://opendev.org/openstack/openstack-ansible-specs +.. _unmerged specs: https://review.opendev.org/#/q/status:+open+project:openstack/openstack-ansible-specs .. _Best Practice: https://docs.ansible.com/ansible/playbooks_best_practices.html#directory-layout Example process for adding a feature to an existing role @@ -199,7 +199,7 @@ with no constraint like writing a specification, or creating a bug. Instead, the new code has to be isolated on a separate folder of the `openstack-ansible-ops repo`_. -.. _openstack-ansible-ops repo: https://git.openstack.org/cgit/openstack/openstack-ansible-ops +.. _openstack-ansible-ops repo: https://opendev.org/openstack/openstack-ansible-ops .. _backport: diff --git a/doc/source/contributor/testing.rst b/doc/source/contributor/testing.rst index ff5af78e03..d9bc0f808e 100644 --- a/doc/source/contributor/testing.rst +++ b/doc/source/contributor/testing.rst @@ -30,7 +30,7 @@ This folder contains at least the following files: * Only add a ``zuul.d`` folder when your role is imported into the openstack-ansible namespace. -.. _tests repository: https://git.openstack.org/cgit/openstack/openstack-ansible-tests +.. _tests repository: https://opendev.org/openstack/openstack-ansible-tests Extending tests of an existing role =================================== @@ -121,7 +121,7 @@ A consolidated set of all lint tests may be done locally by executing: ./run_tests.sh linters .. _PEP8: https://www.python.org/dev/peps/pep-0008/ -.. _Bashate: https://git.openstack.org/cgit/openstack-dev/bashate +.. _Bashate: https://opendev.org/openstack-dev/bashate .. _ansible-lint: https://github.com/willthames/ansible-lint Documentation building diff --git a/doc/source/reference/configuration/extending-osa.rst b/doc/source/reference/configuration/extending-osa.rst index b4602a9fb1..f773c39477 100644 --- a/doc/source/reference/configuration/extending-osa.rst +++ b/doc/source/reference/configuration/extending-osa.rst @@ -78,6 +78,6 @@ You can override the ansible-role-requirement file used by defining the environment variable ``ANSIBLE_ROLE_FILE`` before running the ``bootstrap-ansible.sh`` script. -.. _ansible-role-requirements: https://git.openstack.org/cgit/openstack/openstack-ansible/tree/ansible-role-requirements.yml +.. _ansible-role-requirements: https://opendev.org/openstack/openstack-ansible/src/ansible-role-requirements.yml diff --git a/doc/source/user/aio/quickstart.rst b/doc/source/user/aio/quickstart.rst index 81573aef06..3a5772d15a 100644 --- a/doc/source/user/aio/quickstart.rst +++ b/doc/source/user/aio/quickstart.rst @@ -102,7 +102,7 @@ repository root directory: .. code-block:: shell-session - # git clone https://git.openstack.org/openstack/openstack-ansible \ + # git clone https://opendev.org/openstack/openstack-ansible \ /opt/openstack-ansible # cd /opt/openstack-ansible @@ -177,7 +177,7 @@ options. Deployers have the option to change how the host is bootstrapped. This is useful when you wish the AIO to make use of a secondary data disk, or when using this role to bootstrap a multi-node development environment. -.. _bootstrap-host role defaults: https://git.openstack.org/cgit/openstack/openstack-ansible/tree/tests/roles/bootstrap-host/defaults/main.yml +.. _bootstrap-host role defaults: https://opendev.org/openstack/openstack-ansible/src/tests/roles/bootstrap-host/defaults/main.yml The bootstrap script is pre-set to pass the environment variable ``BOOTSTRAP_OPTS`` as an additional option to the bootstrap process. For diff --git a/playbooks/defaults/healthchecks-vars.yml b/playbooks/defaults/healthchecks-vars.yml index 515ae9098c..25caceeccb 100644 --- a/playbooks/defaults/healthchecks-vars.yml +++ b/playbooks/defaults/healthchecks-vars.yml @@ -59,8 +59,8 @@ neutron_networks: heat_stack: # Please use the following for a nova app: - # http://git.openstack.org/cgit/openstack/heat-templates/plain/hot/hello_world.yaml - source_url: http://git.openstack.org/cgit/openstack/heat-templates/plain/hot/keystone/keystone_domain.yaml + # https://opendev.org/openstack/heat-templates/raw/hot/hello_world.yaml + source_url: https://opendev.org/openstack/heat-templates/raw/hot/keystone/keystone_domain.yaml dest_file: /tmp/mystack.yaml name: babar tag: dumbo diff --git a/playbooks/defaults/repo_packages/openstack_services.yml b/playbooks/defaults/repo_packages/openstack_services.yml index 58ed29e14c..a14e38aa38 100644 --- a/playbooks/defaults/repo_packages/openstack_services.yml +++ b/playbooks/defaults/repo_packages/openstack_services.yml @@ -301,12 +301,14 @@ panko_git_install_branch: 91f809625560d770f39299f782eff2b56ec84874 # HEAD as of panko_git_project_group: panko_all panko_git_track_branch: master + ## Placement service -placement_git_repo: https://git.openstack.org/openstack/placement +placement_git_repo: https://opendev.org/openstack/placement placement_git_install_branch: 8f2a400208d6abb96e7c6feec68fae4dc31095ec # HEAD as of 02.05.2019 placement_git_project_group: placement_all placement_git_track_branch: master + ## Tacker service tacker_git_repo: https://opendev.org/openstack/tacker tacker_git_install_branch: dc4343bda48cb52b63840cd16470ba3ff9460151 # HEAD as of 29.03.2019 diff --git a/playbooks/healthcheck-hosts.yml b/playbooks/healthcheck-hosts.yml index ea0e209ec5..074e851cde 100644 --- a/playbooks/healthcheck-hosts.yml +++ b/playbooks/healthcheck-hosts.yml @@ -51,7 +51,7 @@ - name: Check if dns resolution and external connectivity is fine get_url: - url: https://git.openstack.org/cgit/openstack/openstack-ansible/plain/ansible-role-requirements.yml + url: https://opendev.org/openstack/openstack-ansible/raw/ansible-role-requirements.yml dest: /tmp/osa-master-requirements environment: "{{ deployment_environment_variables | default({}) }}" diff --git a/playbooks/utility-install.yml b/playbooks/utility-install.yml index 495b1ee0fd..859240e053 100644 --- a/playbooks/utility-install.yml +++ b/playbooks/utility-install.yml @@ -22,7 +22,7 @@ - "defaults/repo_packages/openstack_services.yml" - "defaults/{{ install_method }}_install.yml" vars: - utility_upper_constraints_url: "{{ requirements_git_url | default('https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=' ~ requirements_git_install_branch | default('master')) }}" + utility_upper_constraints_url: "{{ requirements_git_url | default('https://opendev.org/openstack/requirements/raw/' ~ requirements_git_install_branch | default('master')) ~ '/upper-constraints.txt' }}" tags: - utility handlers: diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index 613aa7cef3..28a16dbbd9 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -63,7 +63,7 @@ title = u'OpenStack-Ansible Release Notes' # The link to the browsable source code (for the left hand menu) oslosphinx_cgit_link = ( - "https://git.openstack.org/cgit/openstack/{}".format(target_name) + "https://opendev.org/openstack/{}".format(target_name) ) # Release notes are version independent diff --git a/run_tests.sh b/run_tests.sh index 0d2891de24..cd30a60b6a 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -21,7 +21,7 @@ # WARNING: # This file is maintained in the openstack-ansible-tests repository. -# https://git.openstack.org/cgit/openstack/openstack-ansible-tests/tree/run_tests.sh +# https://opendev.org/openstack/openstack-ansible-tests/src/run_tests.sh # If you need to modify this file, update the one in the openstack-ansible-tests # repository and then update this file as well. The purpose of this file is to # prepare the host and then execute all the tox tests. @@ -75,7 +75,7 @@ if [[ ! -d "${COMMON_TESTS_PATH}" ]]; then ln -s "${WORKING_DIR}" "${COMMON_TESTS_PATH}" # In zuul v3 any dependent repository is placed into - # /home/zuul/src/git.openstack.org, so we check to see + # /home/zuul/src/opendev.org, so we check to see # if there is a tests checkout there already. If so, we # symlink that and use it. elif [[ -d "${ZUUL_TESTS_CLONE_LOCATION}" ]]; then @@ -85,7 +85,7 @@ if [[ ! -d "${COMMON_TESTS_PATH}" ]]; then # repo in some way, so just clone it from upstream. else git clone -b "${TESTING_BRANCH}" \ - https://git.openstack.org/openstack/openstack-ansible-tests \ + https://opendev.org/openstack/openstack-ansible-tests \ "${COMMON_TESTS_PATH}" fi fi diff --git a/scripts/bootstrap-ansible.sh b/scripts/bootstrap-ansible.sh index 1a0623b441..a1f9cd1004 100755 --- a/scripts/bootstrap-ansible.sh +++ b/scripts/bootstrap-ansible.sh @@ -114,7 +114,7 @@ PYTHON_VERSION="$($PYTHON_EXEC_PATH -c 'import sys; print(".".join(map(str, sys. UPPER_CONSTRAINTS_PROTO=$([ "$PYTHON_VERSION" == $(echo -e "$PYTHON_VERSION\n2.7.9" | sort -V | tail -1) ] && echo "https" || echo "http") # Set the location of the constraints to use for all pip installations -export UPPER_CONSTRAINTS_FILE=${UPPER_CONSTRAINTS_FILE:-"$UPPER_CONSTRAINTS_PROTO://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?id=$(awk '/requirements_git_install_branch:/ {print $2}' playbooks/defaults/repo_packages/openstack_services.yml)"} +export UPPER_CONSTRAINTS_FILE=${UPPER_CONSTRAINTS_FILE:-"$UPPER_CONSTRAINTS_PROTO://opendev.org/openstack/requirements/raw/$(awk '/requirements_git_install_branch:/ {print $2}' playbooks/defaults/repo_packages/openstack_services.yml)/upper-constraints.txt"} # All distros have a python-virtualenv > 13. # - Centos 7 has 15.1, which holds pip 9.0.1, setuptools 28.8, wheel 0.29 diff --git a/scripts/scripts-library.sh b/scripts/scripts-library.sh index 32b3263231..dd0a05db70 100755 --- a/scripts/scripts-library.sh +++ b/scripts/scripts-library.sh @@ -155,7 +155,7 @@ function gate_job_exit_tasks { function setup_ara { # Install ARA and add it to the callback path provided by bootstrap-ansible.sh/openstack-ansible.rc # This is added *here* instead of bootstrap-ansible so it's used for CI purposes only. - ARA_SRC_HOME="${HOME}/src/git.openstack.org/openstack/ara" + ARA_SRC_HOME="${HOME}/src/opendev.org/recordsansible/ara" if [[ -d "${ARA_SRC_HOME}" ]]; then # This installs from a git checkout # PIP_COMMAND and PIP_OPTS are exported by the bootstrap-ansible script. diff --git a/scripts/sources-branch-updater-lib.sh b/scripts/sources-branch-updater-lib.sh index 7f6ba2d33c..edf6394e72 100644 --- a/scripts/sources-branch-updater-lib.sh +++ b/scripts/sources-branch-updater-lib.sh @@ -54,7 +54,7 @@ osa_helper_clone_os_package() { osa_helper_clone_osa_role() { local repo_name="${1}" local osa_branch="${2}" - local osa_repo_address="${3:-https://git.openstack.org/openstack/openstack-ansible-os_${repo_name}}" + local osa_repo_address="${3:-https://opendev.org/openstack/openstack-ansible-os_${repo_name}}" local osa_repo_tmp_path="/tmp/osa_${repo_name}" osa_helper_cleanup_files ${osa_repo_tmp_path} @@ -79,7 +79,7 @@ sync_roles_and_packages() { local osa_branch="${1}"; shift local service_file="${1}"; shift local openstack_service_list="$@" - local osa_repo_address="https://git.openstack.org/openstack/openstack-ansible-os_${repo_name}" + local osa_repo_address="https://opendev.org/openstack/openstack-ansible-os_${repo_name}" IFS=$'\n' @@ -246,8 +246,8 @@ update_ansible_role_requirements() { role_name=$(sed 's/^[ \t-]*//' ansible-role-requirements.yml | awk '/src: / || /name: / {print $2}' | grep -B1 "${role_src}" | head -n 1) echo "... updating ${role_name}" - # If the role_src is NOT from git.openstack.org, try to get a tag first unless we are working on master - if [[ ${role_src} != *"git.openstack.org"* ]] && [[ "${force_master}" != "true" ]]; then + # If the role_src is NOT from opendev.org, try to get a tag first unless we are working on master + if [[ ${role_src} != *"opendev.org"* ]] && [[ "${force_master}" != "true" ]]; then role_version=$(git ls-remote --tags ${role_src} | awk '{print $2}' | grep -v '{}' | cut -d/ -f 3 | sort --version-sort | tail -n 1) fi @@ -263,7 +263,7 @@ update_ansible_role_requirements() { fi # For OSA roles, get the release notes - if [[ ${role_src} == *"git.openstack.org"* ]]; then + if [[ ${role_src} == *"opendev.org"* ]]; then local osa_repo_tmp_path="/tmp/osa_${role_name}" osa_helper_clone_osa_role $role_name $osa_branch $role_src diff --git a/tests/roles/bootstrap-host/templates/user_variables_barbican.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables_barbican.yml.j2 index b25fdbf3e6..8f14738edf 100644 --- a/tests/roles/bootstrap-host/templates/user_variables_barbican.yml.j2 +++ b/tests/roles/bootstrap-host/templates/user_variables_barbican.yml.j2 @@ -12,7 +12,7 @@ tempest_plugins: - name: barbican-tempest-plugin - repo: https://git.openstack.org/openstack/barbican-tempest-plugin + repo: https://opendev.org/openstack/barbican-tempest-plugin branch: master tempest_test_whitelist: diff --git a/tests/roles/bootstrap-host/templates/user_variables_manila.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables_manila.yml.j2 index 20b8cd99fd..1ca4c251af 100644 --- a/tests/roles/bootstrap-host/templates/user_variables_manila.yml.j2 +++ b/tests/roles/bootstrap-host/templates/user_variables_manila.yml.j2 @@ -12,7 +12,7 @@ tempest_plugins: - name: manila-tempest-plugin - repo: https://git.openstack.org/openstack/manila-tempest-plugin + repo: https://opendev.org/openstack/manila-tempest-plugin branch: master tempest_test_whitelist: diff --git a/tox.ini b/tox.ini index 90f748decb..7538d53837 100644 --- a/tox.ini +++ b/tox.ini @@ -8,7 +8,7 @@ envlist = linters,docs,releasenotes,inventory,py3-inventory usedevelop = True basepython = python2.7 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/upper-constraints.txt} {opts} {packages} deps = -r{toxinidir}/global-requirement-pins.txt -r{toxinidir}/test-requirements.txt @@ -105,15 +105,15 @@ commands = # the tox config is exactly the same as other repositories. # # The value for other repositories must be: -# http://git.openstack.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt +# https://opendev.org/openstack/openstack-ansible-tests/raw/test-ansible-deps.txt # or for a stable branch: -# http://git.openstack.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt?h=stable/newton +# https://opendev.org/openstack/openstack-ansible-tests/raw/stable/stein/test-ansible-deps.txt [testenv:ansible] basepython = python3 deps = {[testenv]deps} -r{toxinidir}/global-requirement-pins.txt - -rhttps://git.openstack.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt + -rhttps://opendev.org/openstack/openstack-ansible-tests/raw/test-ansible-deps.txt