From 87cbdd66495068a3ae3bcadf25d3e40846fd346a Mon Sep 17 00:00:00 2001 From: melissaml Date: Sun, 5 May 2019 18:33:39 +0800 Subject: [PATCH] Replace git.openstack.org URLs with opendev.org URLs Change-Id: I790c1876a3e44da8623c74632332f0e453dce1f6 --- README.rst | 2 +- .../ansible-requirements.yml | 8 ++++---- cluster_metrics/readme.rst | 2 +- doc/source/conf.py | 2 +- elk_metrics_6x/ansible-role-requirements.yml | 6 +++--- .../tests/ansible-role-requirements.yml | 16 ++++++++-------- elk_metrics_6x/tests/run-setup.yml | 2 +- generate_requirements/run.sh | 2 +- leap-upgrades/lib/vars.sh | 2 +- multi-node-aio/README.rst | 4 ++-- multi-node-aio/bootstrap.sh | 4 ++-- multi-node-aio/build.sh | 4 ++-- multi-node-aio/playbooks/deploy-elk.yml | 2 +- multi-node-aio/playbooks/deploy-osa.yml | 2 +- multi-node-aio/run_tests.sh | 4 ++-- osquery/ansible-role-requirements.yml | 10 +++++----- osquery/tests/ansible-role-requirements.yml | 16 ++++++++-------- osquery/tests/run-setup.yml | 2 +- skydive/ansible-role-requirements.yml | 4 ++-- skydive/tests/ansible-role-requirements.yml | 4 ++-- skydive/tests/functional.yml | 2 +- skydive/tests/run-setup.yml | 2 +- tox.ini | 2 +- 23 files changed, 52 insertions(+), 52 deletions(-) diff --git a/README.rst b/README.rst index 35b5d574..7145563d 100644 --- a/README.rst +++ b/README.rst @@ -26,7 +26,7 @@ Release notes for the project can be found at: https://docs.openstack.org/releasenotes/openstack-ansible-ops/ The project source code repository is located at: - https://git.openstack.org/cgit/openstack/openstack-ansible-os_ops + https://opendev.org/openstack/openstack-ansible-os_ops The project home is at: https://launchpad.net/openstack-ansible diff --git a/bootstrap-embedded-ansible/ansible-requirements.yml b/bootstrap-embedded-ansible/ansible-requirements.yml index 2f558498..a810380f 100644 --- a/bootstrap-embedded-ansible/ansible-requirements.yml +++ b/bootstrap-embedded-ansible/ansible-requirements.yml @@ -1,17 +1,17 @@ --- - name: config_template scm: git - src: https://git.openstack.org/openstack/ansible-config_template + src: https://opendev.org/openstack/ansible-config_template version: d97279293d09ab3cae6e20119662029d6b64b3b7 - name: plugins scm: git - src: https://git.openstack.org/openstack/openstack-ansible-plugins + src: https://opendev.org/openstack/openstack-ansible-plugins version: 7fd6dd21123f162091631d87bf1db8fb7700fcda - name: systemd_service scm: git - src: https://git.openstack.org/openstack/ansible-role-systemd_service + src: https://opendev.org/openstack/ansible-role-systemd_service version: 86ad639f4171b0c01bba030ebc3fd96ec020aa45 - name: systemd_mount scm: git - src: https://git.openstack.org/openstack/ansible-role-systemd_mount + src: https://opendev.org/openstack/ansible-role-systemd_mount version: master diff --git a/cluster_metrics/readme.rst b/cluster_metrics/readme.rst index 5750b438..be2aa279 100644 --- a/cluster_metrics/readme.rst +++ b/cluster_metrics/readme.rst @@ -19,7 +19,7 @@ Clone the OPS repo .. code-block:: bash cd /opt - git clone https://git.openstack.org/openstack/openstack-ansible-ops + git clone https://git.opendev.org/openstack/openstack-ansible-ops Copy the env.d files into place diff --git a/doc/source/conf.py b/doc/source/conf.py index 08bf372c..e93bc052 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -68,7 +68,7 @@ title = 'OpenStack-Ansible Documentation: ' + role_name + 'role' # 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://git.opendev.org/cgit/openstack/{}'.format(target_name) ) # The version info for the project you're documenting, acts as replacement for diff --git a/elk_metrics_6x/ansible-role-requirements.yml b/elk_metrics_6x/ansible-role-requirements.yml index 4a5ad5d4..068b7712 100644 --- a/elk_metrics_6x/ansible-role-requirements.yml +++ b/elk_metrics_6x/ansible-role-requirements.yml @@ -1,13 +1,13 @@ --- - name: systemd_service scm: git - src: https://git.openstack.org/openstack/ansible-role-systemd_service + src: https://opendev.org/openstack/ansible-role-systemd_service version: master - name: systemd_mount scm: git - src: https://git.openstack.org/openstack/ansible-role-systemd_mount + src: https://opendev.org/openstack/ansible-role-systemd_mount version: master - name: config_template scm: git - src: https://git.openstack.org/openstack/ansible-config_template + src: https://opendev.org/openstack/ansible-config_template version: master diff --git a/elk_metrics_6x/tests/ansible-role-requirements.yml b/elk_metrics_6x/tests/ansible-role-requirements.yml index 85ba806d..6ecfc2d8 100644 --- a/elk_metrics_6x/tests/ansible-role-requirements.yml +++ b/elk_metrics_6x/tests/ansible-role-requirements.yml @@ -1,33 +1,33 @@ --- - name: apt_package_pinning scm: git - src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning + src: https://opendev.org/openstack/openstack-ansible-apt_package_pinning version: master - name: config_template scm: git - src: https://git.openstack.org/openstack/ansible-config_template + src: https://opendev.org/openstack/ansible-config_template version: master - name: nspawn_container_create scm: git - src: https://git.openstack.org/openstack/openstack-ansible-nspawn_container_create + src: https://opendev.org/openstack/openstack-ansible-nspawn_container_create version: master - name: nspawn_hosts scm: git - src: https://git.openstack.org/openstack/openstack-ansible-nspawn_hosts + src: https://opendev.org/openstack/openstack-ansible-nspawn_hosts version: master - name: plugins scm: git - src: https://git.openstack.org/openstack/openstack-ansible-plugins + src: https://opendev.org/openstack/openstack-ansible-plugins version: master - name: systemd_mount scm: git - src: https://git.openstack.org/openstack/ansible-role-systemd_mount + src: https://opendev.org/openstack/ansible-role-systemd_mount version: master - name: systemd_networkd scm: git - src: https://git.openstack.org/openstack/ansible-role-systemd_networkd + src: https://opendev.org/openstack/ansible-role-systemd_networkd version: master - name: systemd_service scm: git - src: https://git.openstack.org/openstack/ansible-role-systemd_service + src: https://opendev.org/openstack/ansible-role-systemd_service version: master diff --git a/elk_metrics_6x/tests/run-setup.yml b/elk_metrics_6x/tests/run-setup.yml index bd5d179b..ceb111f5 100644 --- a/elk_metrics_6x/tests/run-setup.yml +++ b/elk_metrics_6x/tests/run-setup.yml @@ -32,7 +32,7 @@ - name: Set current test repo (cross-repo) set_fact: - current_test_repo: "git.openstack.org/{{ osa_test_repo }}" + current_test_repo: "opendev.org/{{ osa_test_repo }}" when: - osa_test_repo is defined diff --git a/generate_requirements/run.sh b/generate_requirements/run.sh index 7bc6c09c..3ab701ee 100644 --- a/generate_requirements/run.sh +++ b/generate_requirements/run.sh @@ -15,7 +15,7 @@ MYWD=$(pwd) if [ ! -d "openstack-ansible" ]; then - git clone https://git.openstack.org/openstack/openstack-ansible + git clone https://git.opendev.org/openstack/openstack-ansible fi cd openstack-ansible git checkout master diff --git a/leap-upgrades/lib/vars.sh b/leap-upgrades/lib/vars.sh index 1f1e24d8..ca19671a 100644 --- a/leap-upgrades/lib/vars.sh +++ b/leap-upgrades/lib/vars.sh @@ -19,7 +19,7 @@ export DEBUG="${DEBUG:-TRUE}" export DEBUG_PATH="${DEBUG_PATH:-/tmp/run_debug}" ## Script Vars --------------------------------------------------------------- -export OSA_REPO_URL="${OSA_REPO_URL:-https://git.openstack.org/openstack/openstack-ansible}" +export OSA_REPO_URL="${OSA_REPO_URL:-https://git.opendev.org/openstack/openstack-ansible}" export JUNO_RELEASE="${JUNO_RELEASE:-eol-juno}" export KILO_RELEASE="${KILO_RELEASE:-11.2.17}" # eol-kilo has swift in upper-constraints, preventing venv building export LIBERTY_RELEASE="${LIBERTY_RELEASE:-liberty-eol}" diff --git a/multi-node-aio/README.rst b/multi-node-aio/README.rst index 782d91bc..48e3e716 100644 --- a/multi-node-aio/README.rst +++ b/multi-node-aio/README.rst @@ -155,10 +155,10 @@ Instruct the VM to use the selected kernel meta package, eg. linux-generic: ``DEFAULT_KERNEL=${DEFAULT_KERNEL:-linux-image-generic}`` Set the OSA repo for this script to retrieve: - ``OSA_REPO=${OSA_REPO:-https://git.openstack.org/openstack/openstack-ansible}`` + ``OSA_REPO=${OSA_REPO:-https://git.opendev.org/openstack/openstack-ansible}`` Set the openstack-ansible-ops repo to retrieve for the ELK stack: - ``OS_OPS_REPO=${OS_OPS_REPO:-https://git.openstack.org/openstack/openstack-ansible-ops}`` + ``OS_OPS_REPO=${OS_OPS_REPO:-https://git.opendev.org/openstack/openstack-ansible-ops}`` Set the OSA branch for this script to deploy: ``OSA_BRANCH=${OSA_BRANCH:-master}`` diff --git a/multi-node-aio/bootstrap.sh b/multi-node-aio/bootstrap.sh index 3307f8f1..15cbb08b 100755 --- a/multi-node-aio/bootstrap.sh +++ b/multi-node-aio/bootstrap.sh @@ -92,7 +92,7 @@ if [[ ${#BINDEP_PKGS} > 0 ]]; then fi # Install latest OSA supported Ansible version -sudo pip install -r https://git.openstack.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt?h=${OSA_DEPS_BRANCH} +sudo pip install -r https://git.opendev.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt?h=${OSA_DEPS_BRANCH} # Get the latest OSA plugins # This is used to allow access from the MNAIO host to @@ -100,5 +100,5 @@ sudo pip install -r https://git.openstack.org/cgit/openstack/openstack-ansible-t # do execute things from infra1. mkdir -p ~/.ansible if [[ ! -d ~/.ansible/plugins ]]; then - git clone -b ${OSA_DEPS_BRANCH} https://git.openstack.org/openstack/openstack-ansible-plugins ~/.ansible/plugins + git clone -b ${OSA_DEPS_BRANCH} https://git.opendev.org/openstack/openstack-ansible-plugins ~/.ansible/plugins fi diff --git a/multi-node-aio/build.sh b/multi-node-aio/build.sh index daf57f48..05cfd4ed 100755 --- a/multi-node-aio/build.sh +++ b/multi-node-aio/build.sh @@ -37,8 +37,8 @@ ansible-playbook -vv \ -e deploy_vms=${DEPLOY_VMS:-"true"} \ -e deploy_osa=${DEPLOY_OSA:-"true"} \ -e deploy_elk=${DEPLOY_ELK:-"false"} \ - -e osa_repo=${OSA_REPO:-"https://git.openstack.org/openstack/openstack-ansible"} \ - -e os_ops_repo=${OS_OPS_REPO:-"https://git.openstack.org/openstack/openstack-ansible-ops"} \ + -e osa_repo=${OSA_REPO:-"https://git.opendev.org/openstack/openstack-ansible"} \ + -e os_ops_repo=${OS_OPS_REPO:-"https://git.opendev.org/openstack/openstack-ansible-ops"} \ -e osa_branch=${OSA_BRANCH:-"master"} \ -e os_ops_branch=${OS_OPS_BRANCH:-"master"} \ -e default_network=${DEFAULT_NETWORK:-"eth0"} \ diff --git a/multi-node-aio/playbooks/deploy-elk.yml b/multi-node-aio/playbooks/deploy-elk.yml index bbae173b..a3afd0aa 100644 --- a/multi-node-aio/playbooks/deploy-elk.yml +++ b/multi-node-aio/playbooks/deploy-elk.yml @@ -34,7 +34,7 @@ # Example read-write git checkout from github - name: Get openstack-ansible-ops git: - repo: "{{ os_ops_repo | default('https://git.openstack.org/openstack/openstack-ansible-ops') }}" + repo: "{{ os_ops_repo | default('https://git.opendev.org/openstack/openstack-ansible-ops') }}" dest: /opt/openstack-ansible-ops version: "{{ os_ops_branch | default('master') }}" force: true diff --git a/multi-node-aio/playbooks/deploy-osa.yml b/multi-node-aio/playbooks/deploy-osa.yml index 2b3c11ae..c71ed909 100644 --- a/multi-node-aio/playbooks/deploy-osa.yml +++ b/multi-node-aio/playbooks/deploy-osa.yml @@ -34,7 +34,7 @@ # Example read-write git checkout from github - name: Get OSA git: - repo: "{{ osa_repo | default('https://git.openstack.org/openstack/openstack-ansible') }}" + repo: "{{ osa_repo | default('https://git.opendev.org/openstack/openstack-ansible') }}" dest: /opt/openstack-ansible version: "{{ osa_branch | default('master') }}" when: diff --git a/multi-node-aio/run_tests.sh b/multi-node-aio/run_tests.sh index cdae6a93..f594f3c1 100755 --- a/multi-node-aio/run_tests.sh +++ b/multi-node-aio/run_tests.sh @@ -15,7 +15,7 @@ # # Note: # This file is maintained in the openstack-ansible-tests repository. -# https://git.openstack.org/cgit/openstack/openstack-ansible-tests/tree/run_tests.sh +# https://git.opendev.org/cgit/openstack/openstack-ansible-tests/tree/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. @@ -49,7 +49,7 @@ install_pkg_deps() { git_clone_repo() { if [[ ! -d "${WORKING_DIR}/tests/common" ]]; then git clone \ - https://git.openstack.org/openstack/openstack-ansible-tests \ + https://git.opendev.org/openstack/openstack-ansible-tests \ ${WORKING_DIR}/tests/common fi } diff --git a/osquery/ansible-role-requirements.yml b/osquery/ansible-role-requirements.yml index 31d91033..e0a8a6b5 100644 --- a/osquery/ansible-role-requirements.yml +++ b/osquery/ansible-role-requirements.yml @@ -1,11 +1,11 @@ --- - name: systemd_service scm: git - src: https://git.openstack.org/openstack/ansible-role-systemd_service + src: https://opendev.org/openstack/ansible-role-systemd_service version: master - name: config_template scm: git - src: https://git.openstack.org/openstack/ansible-config_template + src: https://opendev.org/openstack/ansible-config_template version: master - name: redis scm: git @@ -13,7 +13,7 @@ version: master - name: galera_client scm: git - src: https://git.openstack.org/openstack/openstack-ansible-galera_client + src: https://opendev.org/openstack/openstack-ansible-galera_client version: master # Galera server is using a forked role until https://review.openstack.org/#/c/633321/ is merged - name: galera_server @@ -22,9 +22,9 @@ version: xinetd-check - name: apt_package_pinning scm: git - src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning + src: https://opendev.org/openstack/openstack-ansible-apt_package_pinning version: master - name: plugins scm: git - src: https://git.openstack.org/openstack/openstack-ansible-plugins + src: https://opendev.org/openstack/openstack-ansible-plugins version: master diff --git a/osquery/tests/ansible-role-requirements.yml b/osquery/tests/ansible-role-requirements.yml index 85ba806d..6ecfc2d8 100644 --- a/osquery/tests/ansible-role-requirements.yml +++ b/osquery/tests/ansible-role-requirements.yml @@ -1,33 +1,33 @@ --- - name: apt_package_pinning scm: git - src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning + src: https://opendev.org/openstack/openstack-ansible-apt_package_pinning version: master - name: config_template scm: git - src: https://git.openstack.org/openstack/ansible-config_template + src: https://opendev.org/openstack/ansible-config_template version: master - name: nspawn_container_create scm: git - src: https://git.openstack.org/openstack/openstack-ansible-nspawn_container_create + src: https://opendev.org/openstack/openstack-ansible-nspawn_container_create version: master - name: nspawn_hosts scm: git - src: https://git.openstack.org/openstack/openstack-ansible-nspawn_hosts + src: https://opendev.org/openstack/openstack-ansible-nspawn_hosts version: master - name: plugins scm: git - src: https://git.openstack.org/openstack/openstack-ansible-plugins + src: https://opendev.org/openstack/openstack-ansible-plugins version: master - name: systemd_mount scm: git - src: https://git.openstack.org/openstack/ansible-role-systemd_mount + src: https://opendev.org/openstack/ansible-role-systemd_mount version: master - name: systemd_networkd scm: git - src: https://git.openstack.org/openstack/ansible-role-systemd_networkd + src: https://opendev.org/openstack/ansible-role-systemd_networkd version: master - name: systemd_service scm: git - src: https://git.openstack.org/openstack/ansible-role-systemd_service + src: https://opendev.org/openstack/ansible-role-systemd_service version: master diff --git a/osquery/tests/run-setup.yml b/osquery/tests/run-setup.yml index 9228b6bd..d3057eaa 100644 --- a/osquery/tests/run-setup.yml +++ b/osquery/tests/run-setup.yml @@ -32,7 +32,7 @@ - name: Set current test repo (cross-repo) set_fact: - current_test_repo: "git.openstack.org/{{ osa_test_repo }}" + current_test_repo: "opendev.org/{{ osa_test_repo }}" when: - osa_test_repo is defined diff --git a/skydive/ansible-role-requirements.yml b/skydive/ansible-role-requirements.yml index decc3348..08b26ae7 100644 --- a/skydive/ansible-role-requirements.yml +++ b/skydive/ansible-role-requirements.yml @@ -1,9 +1,9 @@ --- - name: config_template scm: git - src: https://git.openstack.org/openstack/ansible-config_template + src: https://opendev.org/openstack/ansible-config_template version: master - name: systemd_service scm: git - src: https://git.openstack.org/openstack/ansible-role-systemd_service + src: https://opendev.org/openstack/ansible-role-systemd_service version: master diff --git a/skydive/tests/ansible-role-requirements.yml b/skydive/tests/ansible-role-requirements.yml index decc3348..08b26ae7 100644 --- a/skydive/tests/ansible-role-requirements.yml +++ b/skydive/tests/ansible-role-requirements.yml @@ -1,9 +1,9 @@ --- - name: config_template scm: git - src: https://git.openstack.org/openstack/ansible-config_template + src: https://opendev.org/openstack/ansible-config_template version: master - name: systemd_service scm: git - src: https://git.openstack.org/openstack/ansible-role-systemd_service + src: https://opendev.org/openstack/ansible-role-systemd_service version: master diff --git a/skydive/tests/functional.yml b/skydive/tests/functional.yml index aa97f880..66b6d7c2 100644 --- a/skydive/tests/functional.yml +++ b/skydive/tests/functional.yml @@ -124,7 +124,7 @@ - name: Get the ops repo git: dest: "/opt/openstack-ansible-ops" - repo: https://git.openstack.org/openstack/openstack-ansible-ops + repo: https://git.opendev.org/openstack/openstack-ansible-ops force: yes track_submodules: yes clone: yes diff --git a/skydive/tests/run-setup.yml b/skydive/tests/run-setup.yml index 4131b3b5..b0790575 100644 --- a/skydive/tests/run-setup.yml +++ b/skydive/tests/run-setup.yml @@ -32,7 +32,7 @@ - name: Set current test repo (cross-repo) set_fact: - current_test_repo: "git.openstack.org/{{ osa_test_repo }}" + current_test_repo: "opendev.org/{{ osa_test_repo }}" when: - osa_test_repo is defined diff --git a/tox.ini b/tox.ini index 937192b7..14417ebf 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,7 @@ envlist = docs,linters [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} commands = /usr/bin/find . -type f -name "*.pyc" -delete passenv =